Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create new session if client reused on different event loop #351

Closed
wants to merge 2 commits into from
Closed

Create new session if client reused on different event loop #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98a2f12
Create new session if client reused on different event loop
jacobtomlinson Apr 18, 2024
46aa28f
Ensure api is not shared between loops
jacobtomlinson Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions kr8s/asyncio/_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# SPDX-FileCopyrightText: Copyright (c) 2023-2024, Kr8s Developers (See LICENSE for list)
# SPDX-License-Identifier: BSD 3-Clause License
import asyncio
import threading

from kr8s._api import Api as _AsyncApi
Expand Down Expand Up @@ -53,18 +54,23 @@ async def api(
async def _f(**kwargs):
key = frozenset(kwargs.items())
thread_id = threading.get_ident()
try:
loop_id = id(asyncio.get_running_loop())
except RuntimeError:
loop_id = 0
thread_loop_id = (thread_id, loop_id)
if (
_cls._instances
and thread_id in _cls._instances
and key in _cls._instances[thread_id]
and thread_loop_id in _cls._instances
and key in _cls._instances[thread_loop_id]
):
return await _cls._instances[thread_id][key]
return await _cls._instances[thread_loop_id][key]
if (
all(k is None for k in kwargs.values())
and thread_id in _cls._instances
and list(_cls._instances[thread_id].values())
and thread_loop_id in _cls._instances
and list(_cls._instances[thread_loop_id].values())
):
return await list(_cls._instances[thread_id].values())[0]
return await list(_cls._instances[thread_loop_id].values())[0]
return await _cls(**kwargs, bypass_factory=True)

return await _f(
Expand Down
11 changes: 11 additions & 0 deletions kr8s/tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ async def create_api(q):
assert type(k1) is type(k2)


def test_api_factory_multi_event_loop():
assert len(kr8s.Api._instances) == 0

async def create_api():
return await kr8s.asyncio.api()

k1 = anyio.run(create_api)
k2 = anyio.run(create_api)
assert k1 is not k2


async def test_api_factory_with_kubeconfig(k8s_cluster, serviceaccount):
k1 = await kr8s.asyncio.api(kubeconfig=k8s_cluster.kubeconfig_path)
k2 = await kr8s.asyncio.api(serviceaccount=serviceaccount)
Expand Down
Loading