diff options
Diffstat (limited to 'crosperf/experiment_factory.py')
| -rw-r--r-- | crosperf/experiment_factory.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/crosperf/experiment_factory.py b/crosperf/experiment_factory.py index 563f3ac6..5b4d4b0d 100644 --- a/crosperf/experiment_factory.py +++ b/crosperf/experiment_factory.py @@ -143,14 +143,20 @@ class ExperimentFactory(object): config.AddConfig('no_email', global_settings.GetField('no_email')) share_cache = global_settings.GetField('share_cache') results_dir = global_settings.GetField('results_dir') + # Warn user that option use_file_locks is deprecated. use_file_locks = global_settings.GetField('use_file_locks') + if use_file_locks: + l = logger.GetLogger() + l.LogWarning('Option use_file_locks is deprecated, please remove it ' + 'from your experiment settings.') locks_dir = global_settings.GetField('locks_dir') - # If we pass a blank locks_dir to the Experiment, it will use the AFE server - # lock mechanism. So if the user specified use_file_locks, but did not - # specify a locks dir, set the locks dir to the default locks dir in + # If not specified, set the locks dir to the default locks dir in # file_lock_machine. - if use_file_locks and not locks_dir: + if not locks_dir: locks_dir = file_lock_machine.Machine.LOCKS_DIR + if not os.path.exists(locks_dir): + raise RuntimeError('Cannot access default lock directory. ' + 'Please run prodaccess or specify a local directory') chrome_src = global_settings.GetField('chrome_src') show_all_results = global_settings.GetField('show_all_results') cwp_dso = global_settings.GetField('cwp_dso') |