Merge branch 'master' into validate-graphs

ICRAR · Feb 20, 2023 · a4bc190 · a4bc190
2 parents e690f9c + 22c8c6f
commit a4bc190
Show file tree

Hide file tree

Showing 70 changed files with 6,359 additions and 3,746 deletions.
diff --git a/daliuge-common/dlg/common/network.py b/daliuge-common/dlg/common/network.py
@@ -46,7 +46,9 @@ def check_port(host, port, timeout=0, checking_open=True, return_socket=False):
     """
 
     if return_socket and not checking_open:
-        raise ValueError("If return_socket is True then checking_open must be True")
+        raise ValueError(
+            "If return_socket is True then checking_open must be True"
+        )
 
     start = time.time()
     while True:
@@ -74,9 +76,13 @@ def check_port(host, port, timeout=0, checking_open=True, return_socket=False):
                 s.connect((host, port))
                 if not return_socket:
                     s.close()
-            except socket.error:
+            except socket.error as e:
                 s.close()
                 raise
+            except OSError as e:
+                # logger.debug("Error opening connection!!")
+                logger.error("Unable to connect to %s:%s", host, port)
+                return not checking_open
 
             # Success if we were checking for an open port!
             if checking_open:

diff --git a/daliuge-common/dlg/common/reproducibility/reproducibility.py b/daliuge-common/dlg/common/reproducibility/reproducibility.py
@@ -848,6 +848,9 @@ def init_runtime_repro_data(runtime_graph: dict, reprodata: dict):
         # logger.warning("Requested reproducibility mode %s not yet implemented", str(rmode))
         level = REPRO_DEFAULT
         reprodata["rmode"] = str(level.value)
+    if level == ReproducibilityFlags.NOTHING:
+        runtime_graph["reprodata"] = reprodata
+        return runtime_graph
     for drop in runtime_graph.values():
         init_rg_repro_drop_data(drop)
     candidate_rmodes = []

diff --git a/daliuge-engine/build_engine.sh b/daliuge-engine/build_engine.sh
@@ -11,7 +11,7 @@ case "$1" in
         echo "Building daliuge-engine version using tag ${VCS_TAG}"
         echo $VCS_TAG > dlg/manager/web/VERSION
         cp ../LICENSE dlg/manager/web/.
-        docker build --build-arg VCS_TAG=${VCS_TAG} --no-cache -t icrar/daliuge-engine:${VCS_TAG} -f docker/Dockerfile .
+        docker build --build-arg USER=${USER} --build-arg VCS_TAG=${VCS_TAG} --no-cache -t icrar/daliuge-engine:${VCS_TAG} -f docker/Dockerfile .
         echo "Build finished!"
         exit 0 ;;
     "dev")
@@ -23,7 +23,7 @@ case "$1" in
         echo "$VERSION:$VCS_TAG" > dlg/manager/web/VERSION
         git rev-parse --verify HEAD >> dlg/manager/web/VERSION
         cp ../LICENSE dlg/manager/web/.
-        docker build --build-arg VCS_TAG=${C_TAG} --no-cache -t icrar/daliuge-engine:${DEV_TAG} -f docker/Dockerfile.dev .
+        docker build --build-arg USER=${USER} --build-arg VCS_TAG=${C_TAG} --no-cache -t icrar/daliuge-engine:${DEV_TAG} -f docker/Dockerfile.dev .
         echo "Build finished!"
         exit 0;;
     "devall")
@@ -34,13 +34,13 @@ case "$1" in
         echo "$VERSION:$VCS_TAG" > dlg/manager/web/VERSION
         git rev-parse --verify HEAD >> dlg/manager/web/VERSION
         cp ../LICENSE dlg/manager/web/.
-        docker build --build-arg VCS_TAG=${VCS_TAG} --no-cache -t icrar/daliuge-engine:${DEV_TAG} -f docker/Dockerfile.devall .
+        docker build --build-arg USER=${USER} --build-arg VCS_TAG=${VCS_TAG} --no-cache -t icrar/daliuge-engine:${DEV_TAG} -f docker/Dockerfile.devall .
         echo "Build finished!"
         exit 0;;
     "slim")
         C_TAG="master"
         echo "Building daliuge-engine slim version ${VCS_TAG} using daliuge-common:${VCS_TAG}"
-        docker build --build-arg VCS_TAG=${VCS_TAG} --no-cache -t icrar/daliuge-engine.big:${VCS_TAG} -f docker/Dockerfile .
+        docker build --build-arg USER=${USER} --build-arg VCS_TAG=${VCS_TAG} --no-cache -t icrar/daliuge-engine.big:${VCS_TAG} -f docker/Dockerfile .
         echo "Build finished! Slimming the image now"
         echo ">>>>> docker-slim output <<<<<<<<<"
         docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock dslim/docker-slim build --include-shell \