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

fix: remove delete of instance if it already exists, as it might be in use by another test #641

Merged
merged 2 commits into from May 31, 2021
Merged

fix: remove delete of instance if it already exists, as it might be in use by another test #641

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fa80e4
test: fix run testing worker code to reduce the chance of same instan…
vi3k6i5 May 26, 2021
38e7aee
fix: remove delete of instance if it already exists, as it might be i…
vi3k6i5 May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 11 additions & 14 deletions run_testing_worker.py
View file
Open in desktop
Expand Up @@ -14,6 +14,8 @@
from google.cloud.spanner_v1 import Client

REGION = "regional-us-central1"
WORKER_INDEX = int(os.getenv("DJANGO_WORKER_INDEX", 0))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you could use a UUID here to (practically) guarantee no clashes will happen.

WORKER_COUNT = int(os.getenv("DJANGO_WORKER_COUNT", 1))


class TestInstance:
Expand All @@ -27,13 +29,11 @@ def __enter__(self):

config = f"{client.project_name}/instanceConfigs/{REGION}"

name = "spanner-django-test-{}".format(str(int(time.time())))
name = "sp-dj-test-{}-{}".format(
str(WORKER_INDEX), str(int(time.time()))
)

self._instance = client.instance(name, config)
if self._instance.exists():
# If test instance already exists first delete it and then create.
self._instance.delete()
created_op.result(120) # block until completion
created_op = self._instance.create()
created_op.result(120) # block until completion
return name
Expand All @@ -42,24 +42,21 @@ def __exit__(self, exc, exc_value, traceback):
self._instance.delete()


worker_index = int(os.getenv("DJANGO_WORKER_INDEX", 0))
worker_count = int(os.getenv("DJANGO_WORKER_COUNT", 1))

if worker_index >= worker_count:
if WORKER_INDEX >= WORKER_COUNT:
print(
"worker_index ({wi}) > worker_count ({wc})".format(
wi=worker_index,
wc=worker_count,
"WORKER_INDEX ({wi}) > WORKER_COUNT ({wc})".format(
wi=WORKER_INDEX,
wc=WORKER_COUNT,
)
)
exit()

with open("django_test_apps.txt", "r") as file:
all_apps = file.read().split("\n")

apps_per_worker = math.ceil(len(all_apps) / worker_count)
apps_per_worker = math.ceil(len(all_apps) / WORKER_COUNT)

start_index = min(worker_index * apps_per_worker, len(all_apps))
start_index = min(WORKER_INDEX * apps_per_worker, len(all_apps))
end_index = min(start_index + apps_per_worker, len(all_apps))

test_apps = all_apps[start_index:end_index]
Expand Down