diff options
Diffstat (limited to 'lib/ansible/plugins/strategy/__init__.py')
| -rw-r--r-- | lib/ansible/plugins/strategy/__init__.py | 50 |
1 files changed, 2 insertions, 48 deletions
diff --git a/lib/ansible/plugins/strategy/__init__.py b/lib/ansible/plugins/strategy/__init__.py index 501f8a6486..f1f4650529 100644 --- a/lib/ansible/plugins/strategy/__init__.py +++ b/lib/ansible/plugins/strategy/__init__.py @@ -153,24 +153,6 @@ class StrategyBase: # way to share them with the forked processes shared_loader_obj = SharedPluginLoaderObj() - def dump_dict(obj, indent=0): - print("%sdict:" % (" "*indent,)) - for k in obj.keys(): - dump_vars(obj[k], indent) - - def dump_list(obj, indent=0): - print("%slist:" % (" "*indent,)) - for item in obj: - dump_vars(item, indent) - - def dump_vars(obj, indent=0): - if isinstance(obj, dict): - dump_dict(obj, indent+2) - elif isinstance(obj, list): - dump_list(obj, indent+2) - else: - print("%svar: %s (%s)" % (" "*indent, obj, type(obj))) - # compress (and convert) the data if so configured, which can # help a lot when the variable dictionary is huge. We pop the # hostvars out of the task variables right now, due to the fact @@ -187,36 +169,6 @@ class StrategyBase: zip_vars = task_vars # noqa (pyflakes false positive because task_vars is deleted in the conditional above) # and queue the task - if False: #C.DEFAULT_DEBUG: - print("vars has %d keys" % len(zip_vars.keys())) - print("vars are:") - dump_vars(zip_vars) - - import datetime - import pickle - import cPickle - p1 = datetime.datetime.now() - d1 = cPickle.dumps(host, pickle.HIGHEST_PROTOCOL) - p2 = datetime.datetime.now() - d2 = cPickle.dumps(task, pickle.HIGHEST_PROTOCOL) - p3 = datetime.datetime.now() - d3 = cPickle.dumps(self._loader.get_basedir(), pickle.HIGHEST_PROTOCOL) - p4 = datetime.datetime.now() - d4 = cPickle.dumps(zip_vars, pickle.HIGHEST_PROTOCOL) - p5 = datetime.datetime.now() - d5 = cPickle.dumps(hostvars, pickle.HIGHEST_PROTOCOL) - p6 = datetime.datetime.now() - d6 = cPickle.dumps(play_context, pickle.HIGHEST_PROTOCOL) - p7 = datetime.datetime.now() - d7 = cPickle.dumps(shared_loader_obj, pickle.HIGHEST_PROTOCOL) - p8 = datetime.datetime.now() - print("time to serialize host: %s (size: %s)" % (p2-p1, len(d1))) - print("time to serialize task: %s (size: %s)" % (p3-p2, len(d2))) - print("time to serialize loader basedir: %s (size: %s)" % (p4-p3, len(d3))) - print("time to serialize vars: %s (size: %s)" % (p5-p4, len(d4))) - print("time to serialize hostvars: %s (size: %s)" % (p6-p5, len(d5))) - print("time to serialize play context: %s (size: %s)" % (p7-p6, len(d6))) - print("time to serialize shared plugin loader: %s (size: %s)" % (p8-p7, len(d7))) main_q.put((host, task, self._loader.get_basedir(), zip_vars, compressed_vars, play_context, shared_loader_obj)) self._pending_results += 1 @@ -321,6 +273,7 @@ class StrategyBase: var_value = wrap_var(result[3]) self._variable_manager.set_nonpersistent_facts(host, {var_name: var_value}) + self._tqm._hostvars_manager.hostvars().set_variable_manager(self._variable_manager) elif result[0] in ('set_host_var', 'set_host_facts'): host = result[1] @@ -351,6 +304,7 @@ class StrategyBase: self._variable_manager.set_nonpersistent_facts(target_host, facts) else: self._variable_manager.set_host_facts(target_host, facts) + self._tqm._hostvars_manager.hostvars().set_variable_manager(self._variable_manager) else: raise AnsibleError("unknown result message received: %s" % result[0]) |