Make Mcs connection scaling flag also require --use_docker.

Author: kannanjgithub

tools/run_tests/python_utils/jobset.py

@@ -323,6 +323,7 @@ def start(self):
             cmdline = ["time", "-p"] + cmdline
         else:
             measure_cpu_costs = False
+        print('Starting subprocess for cmdline: ' + str(cmdline), True)
         try_start = lambda: subprocess.Popen(
             args=cmdline,
             stderr=subprocess.STDOUT,

tools/run_tests/run_interop_tests.py

@@ -1812,39 +1812,42 @@ def aggregate_http2_results(stdout):
                     jobs.append(test_job)
 
     if args.mcs_cs:
-        languages_for_mcs_cs = set(
-            _LANGUAGES[l]
-            for l in _LANGUAGES_WITH_HTTP2_CLIENTS_FOR_HTTP2_SERVER_TEST_CASES
-            if "all" in args.language or l in args.language
-        )
-        if len(languages_for_mcs_cs) > 0:          
-            mcs_server_jobspec = server_jobspec(
-                _LANGUAGES['java'],
-                docker_images.get('java'),
-                args.transport_security,
-                manual_cmd_log=server_manual_cmd_log,
-                use_mcs=True,
+        if not args.use_docker:
+            print('MCS connection scaling test can only be run with --use-docker')
+        else:
+            languages_for_mcs_cs = set(
+                _LANGUAGES[l]
+                for l in _LANGUAGES_WITH_HTTP2_CLIENTS_FOR_HTTP2_SERVER_TEST_CASES
+                if "all" in args.language or l in args.language
             )
-            if mcs_server_jobspec is None:
-              print('Got None from server_jobspec call for mcs.', True)
-
-            mcs_server_job = dockerjob.DockerJob(mcs_server_jobspec)
-            jobs.append(mcs_server_job)
-        
-            for language in languages_for_mcs:
-                test_job = cloud_to_cloud_jobspec(
-                    language,
-                    'mcs',
-                    'java-mcs',
-                    'localhost',
-                    mcs_server_job.mapped_port(_DEFAULT_SERVER_PORT),
-                    docker_image=docker_images.get(str(language)),
-                    transport_security=args.transport_security,
-                    manual_cmd_log=client_manual_cmd_log,
+            if len(languages_for_mcs_cs) > 0:
+                print('Using java for MCS connection scaling server ignoring any args for server languages')
+                mcs_server_jobspec = server_jobspec(
+                    _LANGUAGES['java'],
+                    docker_images.get('java'),
+                    args.transport_security,
+                    manual_cmd_log=server_manual_cmd_log,
+                    use_mcs=True,
                 )
-                jobs.append(test_job)
-        else:
-            print('MCS connection scaling tests will be skipped since noen of the supported client languages for MCS connection scaling testcases was specified')
+                print('mcs_server_jobspec shortname: ' + mcs_server_jobspec.shortname)
+                mcs_server_job = dockerjob.DockerJob(mcs_server_jobspec)
+                jobs.append(mcs_server_job)
+            
+                for language in languages_for_mcs_cs:
+                    test_job = cloud_to_cloud_jobspec(
+                        language,
+                        'mcs',
+                        'java-mcs',
+                        'localhost',
+                        mcs_server_job.mapped_port(_DEFAULT_SERVER_PORT),
+                        docker_image=docker_images.get(str(language)),
+                        transport_security=args.transport_security,
+                        manual_cmd_log=client_manual_cmd_log,
+                    )
+                    print('mcs test job shortname: ' + test_job.shortname)
+                    jobs.append(test_job)
+            else:
+                print('MCS connection scaling tests will be skipped since none of the supported client languages for MCS connection scaling testcases was specified')
 
     if not jobs:
         print("No jobs to run.")