From 0a49a874639856010902fa78c5ae83036344aae7 Mon Sep 17 00:00:00 2001 From: Tiji Thomas Date: Tue, 15 Mar 2022 16:33:04 +0530 Subject: [PATCH 1/2] Fixes gpuaas#8877, assign run id to job name --- Makefile | 2 +- dkube/pipelines/components/op.py | 2 +- launcher/src/job.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 84660578..27b8d57c 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ endef export PRINT_HELP_PYSCRIPT -VERSION=2.3 +VERSION=2.2.0.1 help: @python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST) diff --git a/dkube/pipelines/components/op.py b/dkube/pipelines/components/op.py index bb73741d..ebd125e8 100644 --- a/dkube/pipelines/components/op.py +++ b/dkube/pipelines/components/op.py @@ -14,7 +14,7 @@ def __init__(self, name, authtoken, stage, args=[]): stage in VALID_STAGES ), "stage must be one of training/preprocessing/serving/storage/submit" - kwargs = {"name": name, "image": "ocdr/dkube_pylauncher:2.2"} + kwargs = {"name": name, "image": "ocdr/dkube_pylauncher:2.2.0.1"} kwargs["command"] = ["python3", "-u", "/dkubepl/main.py", name, authtoken] kwargs["command"].extend(["{{workflow.uid}}", "{{pod.name}}", stage]) kwargs["arguments"] = args diff --git a/launcher/src/job.py b/launcher/src/job.py index 2cdfc963..3f09f5b0 100644 --- a/launcher/src/job.py +++ b/launcher/src/job.py @@ -76,7 +76,7 @@ def job( tags, output, ): - name = generate(obj["name"]) + name = obj["runid"] tags = json.loads(tags) tags.extend( [ From c40867bff43e59048a9e42d9f1774c07b65edfb2 Mon Sep 17 00:00:00 2001 From: Tiji Thomas Date: Thu, 7 Apr 2022 19:43:45 +0530 Subject: [PATCH 2/2] Fix random generation in generate function --- dkube/sdk/rsrcs/util.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dkube/sdk/rsrcs/util.py b/dkube/sdk/rsrcs/util.py index f89cc683..16c7c2fe 100644 --- a/dkube/sdk/rsrcs/util.py +++ b/dkube/sdk/rsrcs/util.py @@ -1,7 +1,17 @@ import string import random +from datetime import datetime -generate = lambda hint: "{}-{}".format(hint, ''.join([random.choice(string.digits) for n in range(4)])) +def generate(prefix): + random.seed(datetime.now()) + # truncate length of the prefix to 12 characters + prefix = prefix[:12] + #Total length = 16 characters + N = 16 + #length of random characters to be generated + random_len = N - len(prefix) - 1 + return "{}-{}".format(prefix, ''.join([random.choice(string.ascii_uppercase + string.ascii_lowercase + + string.digits) for n in range(random_len)])) def list_of_strs(x): if x != None: