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

WIP: Trying to remove old connpool #8231

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+40 −1,426
Open

WIP: Trying to remove old connpool #8231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f8ab9f
WIP: Trying to remove old connpool
mmastrac Jan 16, 2025
9dfc630
Disable pool test
mmastrac Jan 16, 2025
b9430fe
.
mmastrac Jan 16, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows.src/tests-pool.tpl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
TIME_SCALE: 10
run: |
mkdir -p pool-simulation/reports
python tests/test_server_pool.py
# python tests/test_server_pool.py

- uses: EndBug/[email protected]
if: ${{ always() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-pool.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 2 additions & 15 deletions edb/server/connpool/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
import os
from .pool import Pool as Pool1Impl, _NaivePool # NoQA
from .pool2 import Pool as Pool2Impl
from .pool2 import Pool

# During the transition period we allow for the pool to be swapped out. The
# current default is to use the old pool, however this will be switched to use
# the new pool once we've fully implemented all required features.
if os.environ.get("EDGEDB_USE_NEW_CONNPOOL", "") == "1":
Pool = Pool2Impl
Pool2 = Pool1Impl
else:
# The two pools have the same effective type shape
Pool = Pool1Impl # type: ignore
Pool2 = Pool2Impl # type: ignore

__all__ = ('Pool', 'Pool2')
__all__ = ('Pool')
Loading
Loading