From f183bc16107248161e77f675090b3e7d69bd8277 Mon Sep 17 00:00:00 2001 From: andrsmit Date: Tue, 5 May 2026 12:48:36 -0400 Subject: [PATCH 1/2] Get RCDB connection from environment variable instead of hard coding an outdated connection. --- Utilities/MCDispatcher.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Utilities/MCDispatcher.py b/Utilities/MCDispatcher.py index b978282..141b155 100755 --- a/Utilities/MCDispatcher.py +++ b/Utilities/MCDispatcher.py @@ -663,7 +663,7 @@ def ParallelTestProject(results_q,index,row,ID,versionSet,commands_to_call=""): query_to_do=order["RCDBQuery"] print("RCDB_QUERY IS: "+str(query_to_do)) - rcdb_db = rcdb.RCDBProvider("mysql://rcdb@hallddb.jlab.org/rcdb") + rcdb_db = rcdb.RCDBProvider(os.environ.get('RCDB_CONNECTION')) try: runList=rcdb_db.select_runs(str(query_to_do),order["RunNumLow"],order["RunNumHigh"]).get_values(['event_count'],True) @@ -956,7 +956,7 @@ def TestProject(ID,versionSet,commands_to_call=""): print("RCDB_QUERY IS: "+str(query_to_do)) #print("run selecting currently broken. RCDB: 'basestring' not defined. Testing first runnumber only") - rcdb_db = rcdb.RCDBProvider("mysql://rcdb@hallddb.jlab.org/rcdb") + rcdb_db = rcdb.RCDBProvider(os.environ.get('RCDB_CONNECTION')) try: print(str(query_to_do)+" | "+str(int(order["RunNumLow"]))+" | "+str(int(order["RunNumHigh"]))) runList=rcdb_db.select_runs(str(query_to_do),order["RunNumLow"],order["RunNumHigh"]).get_values(['event_count'],True) From e8ee8c23e111e76cc2931292e20ca41775612984 Mon Sep 17 00:00:00 2001 From: andrsmit Date: Tue, 5 May 2026 13:28:22 -0400 Subject: [PATCH 2/2] Add default connection string in case RCDB_CONNECTION environment variable is not set. --- Utilities/MCDispatcher.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Utilities/MCDispatcher.py b/Utilities/MCDispatcher.py index 141b155..6ef9d4a 100755 --- a/Utilities/MCDispatcher.py +++ b/Utilities/MCDispatcher.py @@ -36,6 +36,8 @@ #get user name of current user runner_name=pwd.getpwuid( os.getuid() )[0] +DEFAULT_RCDB_CONNECTION="mysql://rcdb@hallddb.jlab.org/rcdb2" + if( not (runner_name=="tbritton" or runner_name=="mcwrap")): print("ERROR: You must be tbritton or mcwrap to run this script") sys.exit(1) @@ -663,7 +665,10 @@ def ParallelTestProject(results_q,index,row,ID,versionSet,commands_to_call=""): query_to_do=order["RCDBQuery"] print("RCDB_QUERY IS: "+str(query_to_do)) - rcdb_db = rcdb.RCDBProvider(os.environ.get('RCDB_CONNECTION')) + connection_string = os.environ.get("RCDB_CONNECTION") + if not connection_string: + connection_string = DEFAULT_RCDB_CONNECTION + rcdb_db = rcdb.RCDBProvider(connection_string) try: runList=rcdb_db.select_runs(str(query_to_do),order["RunNumLow"],order["RunNumHigh"]).get_values(['event_count'],True) @@ -956,7 +961,10 @@ def TestProject(ID,versionSet,commands_to_call=""): print("RCDB_QUERY IS: "+str(query_to_do)) #print("run selecting currently broken. RCDB: 'basestring' not defined. Testing first runnumber only") - rcdb_db = rcdb.RCDBProvider(os.environ.get('RCDB_CONNECTION')) + connection_string = os.environ.get("RCDB_CONNECTION") + if not connection_string: + connection_string = DEFAULT_RCDB_CONNECTION + rcdb_db = rcdb.RCDBProvider(connection_string) try: print(str(query_to_do)+" | "+str(int(order["RunNumLow"]))+" | "+str(int(order["RunNumHigh"]))) runList=rcdb_db.select_runs(str(query_to_do),order["RunNumLow"],order["RunNumHigh"]).get_values(['event_count'],True)