fixed thread is alive check to handle py3.9 updates (#859)

* fixed thread is alive check to handle py3.9 updates * updated the minor version
microsoft · Jun 14, 2022 · 286aa5f · 286aa5f
1 parent 95ffae0
commit 286aa5f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -316,7 +316,7 @@ endif
 
 nxOMSAutomationWorker:
 	rm -rf output/staging; \
-	VERSION="1.7.10.0"; \
+	VERSION="1.8.0.0"; \
 	PROVIDERS="nxOMSAutomationWorker"; \
 	STAGINGDIR="output/staging/$@/DSCResources"; \
 	cat Providers/Modules/$@.psd1 | sed "s@<MODULE_VERSION>@$${VERSION}@" > intermediate/Modules/$@.psd1; \

diff --git a/Providers/nxOMSAutomationWorker/automationworker/3.x/worker/configuration3.py b/Providers/nxOMSAutomationWorker/automationworker/3.x/worker/configuration3.py
@@ -58,7 +58,7 @@
 DEFAULT_VM_ID = DEFAULT_UNKNOWN
 DEFAULT_WORKER_TYPE = DEFAULT_UNKNOWN
 DEFAULT_COMPONENT = DEFAULT_UNKNOWN
-DEFAULT_WORKER_VERSION = "1.7.10.0"
+DEFAULT_WORKER_VERSION = "1.8.0.0"
 DEFAULT_JRDS_POLLING_FREQUENCY = "15"
 
 # state configuration keys

diff --git a/Providers/nxOMSAutomationWorker/automationworker/3.x/worker/job.py b/Providers/nxOMSAutomationWorker/automationworker/3.x/worker/job.py
@@ -139,7 +139,7 @@ def execute_runbook(self):
 
         # wait for runbook execution to complete
         pending_action = None
-        while stream_handler.isAlive() or self.runtime.runbook_subprocess.poll() is None:
+        while stream_handler.is_alive() or self.runtime.runbook_subprocess.poll() is None:
             try:
                 pending_action = self.msg_queue.get(block=False)
                 tracer.log_sandbox_job_pending_action_detected(self.job_id, pending_action)

diff --git a/Providers/nxOMSAutomationWorker/automationworker/3.x/worker/sandbox.py b/Providers/nxOMSAutomationWorker/automationworker/3.x/worker/sandbox.py
@@ -99,7 +99,7 @@ def stop_tracking_terminated_jobs():
 
         # clean up finished jobs
         for job_id, job_tuple in list(job_map.items()):
-            if job_tuple[0].isAlive() is False:
+            if job_tuple[0].is_alive() is False:
                 try:
                     job_tuple[2].get(block=False)
                     raise SandboxRuntimeException()

diff --git a/Providers/nxOMSAutomationWorker/automationworker/worker/configuration.py b/Providers/nxOMSAutomationWorker/automationworker/worker/configuration.py
@@ -56,7 +56,7 @@
 DEFAULT_VM_ID = DEFAULT_UNKNOWN
 DEFAULT_WORKER_TYPE = DEFAULT_UNKNOWN
 DEFAULT_COMPONENT = DEFAULT_UNKNOWN
-DEFAULT_WORKER_VERSION = "1.7.10.0"
+DEFAULT_WORKER_VERSION = "1.8.0.0"
 DEFAULT_JRDS_POLLING_FREQUENCY = "15"
 
 # state configuration keys

diff --git a/Providers/nxOMSAutomationWorker/automationworker/worker/configuration2.py b/Providers/nxOMSAutomationWorker/automationworker/worker/configuration2.py
@@ -55,7 +55,7 @@
 DEFAULT_VM_ID = DEFAULT_UNKNOWN
 DEFAULT_WORKER_TYPE = DEFAULT_UNKNOWN
 DEFAULT_COMPONENT = DEFAULT_UNKNOWN
-DEFAULT_WORKER_VERSION = "1.7.10.0"
+DEFAULT_WORKER_VERSION = "1.8.0.0"
 DEFAULT_JRDS_POLLING_FREQUENCY = "15"
 
 # state configuration keys