Fixed a bug, were k8s workers not installed.

Added `provision_workers` option to install workers separately from `provision_nodes` option.

Author: SysOfM

bin/mzbench

@@ -34,6 +34,7 @@ Usage:
     [--node_commit=<commit>]
     [--deallocate_after_bench=<deallocate_after_bench>]
     [--provision_nodes=<provision_nodes>]
+    [--provision_workers=<provision_workers>]
     [--name=<benchmark_name>]
     [--cloud=<cloud_provider_name>]
     [--tags=<tags>]
@@ -109,6 +110,11 @@ Options:
                      to "true" indicates to perform nodes provision. Disabling
                      it is useful when reusing already preallocated and
                      provisioned nodes.
+    --provision_workers <provision_workers>
+                     Either "true" or "false". Default is "true". Setting this
+                     to "true" indicates to perform workers provision. Disabling
+                     it is useful when reusing already preallocated and
+                     provisioned workers.
     --name <benchmark_name>
                      Set benchmark name.
     --cloud <cloud_provider_name>
@@ -317,18 +323,18 @@ def pretty_print(data):
     print()
 
 def run(host, script_file, script_content, email, nodes, workers_per_node,
-        node_commit, deallocate_after_bench, provision_nodes,
+        node_commit, deallocate_after_bench, provision_nodes, provision_workers,
         name, cloud, tags, env, no_cert_check = False, exclusive = None):
     bench_id = start(host, script_file, script_content, email, node_commit,
         nodes, workers_per_node, deallocate_after_bench, provision_nodes,
-        name, cloud, tags, env, no_cert_check, exclusive)
+        provision_workers, name, cloud, tags, env, no_cert_check, exclusive)
     response = status(host, bench_id, wait=True, no_cert_check = no_cert_check)
     if response[u'status'] == u'failed':
         print('Bench failed')
         sys.exit(3)
 
 def start(host, script_file, script_content, email, node_commit, nodes,
-          workers_per_node, deallocate_after_bench, provision_nodes,
+          workers_per_node, deallocate_after_bench, provision_nodes, provision_workers,
           name, cloud, tags, env, no_cert_check = False, exclusive = None):
     try:
         response = api.start(host,
@@ -338,6 +344,7 @@ def start(host, script_file, script_content, email, node_commit, nodes,
             node_commit=node_commit,
             deallocate_after_bench=deallocate_after_bench,
             provision_nodes=provision_nodes,
+            provision_workers=provision_workers,
             benchmark_name=name,
             cloud=cloud,
             tags=tags,
@@ -684,6 +691,11 @@ def augment_args(args):
                 args['--provision_nodes']))
         sys.exit(4)
 
+    if args['--provision_workers'] not in [None, 'true', 'false']:
+        print("invalid value for --provision_workers: {0}".format(
+                args['--provision_workers']))
+        sys.exit(4)
+
     script_file = args['<script_file>']
     if script_file:
         if not os.path.exists(script_file):

doc/api.md

@@ -52,6 +52,9 @@ deallocate_after_bench=false
 provision_nodes=false
 :   Pass to skip MZBench installation on the nodes.
 
+provision_workers=false
+:   Pass to skip Workers installation on the nodes.
+
 node_commit
 :   Commit hash or branch name in the [MZBench repository](https://github.com/satori-com/mzbench/) that should be installed on the nodes.
 

doc/cli.md

@@ -102,6 +102,9 @@ Optional params:
 `--provision_nodes false`
 :   Skip MZBench installation on the nodes.
 
+`--provision_workers false`
+:   Skip Workers installation on the nodes.
+
 `--node_commit=<commit>`
 :   Commit hash or branch name in the MZBench repository pointing to the MZBench version to install on the nodes.
 

doc_old/api.md

@@ -52,6 +52,9 @@ deallocate_after_bench=false
 provision_nodes=false
 :   Pass to skip MZBench installation on the nodes.
 
+provision_workers=false
+:   Pass to skip installation Workers on the nodes.
+
 node_commit
 :   Commit hash or branch name in the [MZBench repository](https://github.com/satori-com/mzbench/) that should be installed on the nodes.
 

doc_old/cli.md

@@ -102,6 +102,9 @@ Optional params:
 `--provision_nodes false`
 :   Skip MZBench installation on the nodes.
 
+`--provision_workers false`
+:   Skip Workers installation on the nodes.
+
 `--node_commit=<commit>`
 :   Commit hash or branch name in the MZBench repository pointing to the MZBench version to install on the nodes.
 

lib/mzbench_api_client.py

@@ -19,7 +19,7 @@ class MZBenchAPIException(Exception):
 
 def start(host, script_file, script_content,
           node_commit = None, nodes = None, workers_per_node = None, deallocate_after_bench = None,
-          provision_nodes = None, benchmark_name = None,
+          provision_nodes = None, provision_workers = None, benchmark_name = None,
           cloud = None, tags = None, emails=[], includes=[], env={}, no_cert_check = False,
           exclusive = None
         ):
@@ -41,6 +41,8 @@ def start(host, script_file, script_content,
     :type deallocate_after_bench: "true" or "false"
     :param provision_nodes: Install required software
     :type provision_nodes: "true" or "false"
+    :param provision_workers: Install workers
+    :type provision_workers: "true" or "false"
     :param benchmark_name: Set benchmark name
     :type benchmark_name: str or unicode
     :param cloud: Specify cloud provider to use
@@ -84,6 +86,8 @@ def start(host, script_file, script_content,
         params += [('deallocate_after_bench', deallocate_after_bench)]
     if provision_nodes is not None:
         params += [('provision_nodes', provision_nodes)]
+    if provision_workers is not None:
+        params += [('provision_workers', provision_workers)]
     if benchmark_name is not None:
         params += [('benchmark_name', benchmark_name)]
     if cloud is not None:

server/src/mzb_api_bench.erl

@@ -111,6 +111,7 @@ init([Id, Params]) ->
         env => mzbl_script:normalize_env(generate_bench_env(Id, Params)),
         deallocate_after_bench => maps:get(deallocate_after_bench, Params),
         provision_nodes => ProvisionNodes,
+        provision_workers => maps:get(provision_workers, Params),
         req_host => maps:get(req_host, Params),
         initial_user => maps:get(user, Params),
         director_host => undefined,

server/src/mzb_api_endpoints.erl

@@ -520,6 +520,7 @@ parse_start_params(Req) ->
         {emulate_bench_crash,       single_value,   fun binary_to_bool/1,                                       false},
         {deallocate_after_bench,    single_value,   fun binary_to_bool/1,                                       true},
         {provision_nodes,           single_value,   fun binary_to_bool/1,                                       true},
+        {provision_workers,         single_value,   fun binary_to_bool/1,                                       true},
         {benchmark_name,            single_value,   fun erlang:binary_to_list/1,                                undefined},
         {cloud,                     single_value,   fun (N) -> erlang:binary_to_atom(N, latin1) end,            undefined},
         {exclusive,                 single_value,   fun erlang:binary_to_list/1,                                []},

server/src/mzb_api_provision.erl

@@ -14,6 +14,7 @@
 provision_nodes(Config, Logger) ->
     #{
         provision_nodes := ProvisionNodes,
+        provision_workers := ProvisionWorkers,
         director_host := DirectorHost,
         worker_hosts := WorkerHosts,
         user_name := UserName,
@@ -38,10 +39,15 @@ provision_nodes(Config, Logger) ->
 
     case ProvisionNodes of
         true ->
-            ok = install_node(UniqHosts, Config, Logger),
+            ok = install_node(UniqHosts, Config, Logger);
+        _ -> 
+            ok
+    end,
+    case ProvisionWorkers of
+        true ->
             install_workers(UniqHosts, Config, Logger, Env);
         _ -> 
-            ok = install_workers(UniqHosts, Config, Logger, Env)
+            ok
     end,
     DirectorNode = nodename(director_sname(Config), 0),
     WorkerNodes = [nodename(worker_sname(Config), N) || N <- lists:seq(1, length(WorkerHosts))],