From 3368bd3879240fe83f6603504b95113f4c0fb810 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Tue, 11 Aug 2020 09:47:03 -0700 Subject: [PATCH] Two fixes (#1226) * Set maxtasksperchild to help avoid hangs especially on Windows * Fix function reference --- src/gam/__init__.py | 2 +- src/gam/gapi/directory/cros.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 03ab41ec..aa01ae52 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -10959,7 +10959,7 @@ def run_batch(items): if not items: return num_worker_threads = min(len(items), GC_Values[GC_NUM_THREADS]) - pool = mp_pool(num_worker_threads, init_gam_worker) + pool = mp_pool(num_worker_threads, init_gam_worker, maxtasksperchild=200) sys.stderr.write(f'Using {num_worker_threads} processes...\n') try: results = [] diff --git a/src/gam/gapi/directory/cros.py b/src/gam/gapi/directory/cros.py index 4236d809..0ba3effd 100644 --- a/src/gam/gapi/directory/cros.py +++ b/src/gam/gapi/directory/cros.py @@ -7,6 +7,7 @@ from gam import display from gam import fileutils from gam import gapi from gam.gapi import directory as gapi_directory +from gam.gapi.directory import orgunits as gapi_directory_orgunits from gam import utils @@ -32,7 +33,7 @@ def doUpdateCros(): update_body['annotatedAssetId'] = sys.argv[i + 1] i += 2 elif myarg in ['ou', 'org']: - orgUnitPath = gam.getOrgUnitItem(sys.argv[i + 1]) + orgUnitPath = gapi_directory_orgunits.getOrgUnitItem(sys.argv[i + 1]) i += 2 elif myarg == 'action': action = sys.argv[i + 1].lower().replace('_', '').replace('-', '') @@ -358,7 +359,7 @@ def doPrintCrosActivity(): queries = gam.getQueries(myarg, sys.argv[i + 1]) i += 2 elif myarg == 'limittoou': - orgUnitPath = gam.getOrgUnitItem(sys.argv[i + 1]) + orgUnitPath = gapi_directory_orgunits.getOrgUnitItem(sys.argv[i + 1]) i += 2 elif myarg == 'todrive': todrive = True @@ -526,7 +527,7 @@ def doPrintCrosDevices(): queries = gam.getQueries(myarg, sys.argv[i + 1]) i += 2 elif myarg == 'limittoou': - orgUnitPath = gam.getOrgUnitItem(sys.argv[i + 1]) + orgUnitPath = gapi_directory_orgunits.getOrgUnitItem(sys.argv[i + 1]) i += 2 elif myarg == 'todrive': todrive = True