diff --git a/perfmetrics/scripts/continuous_test/gcp_ubuntu/build.sh b/perfmetrics/scripts/continuous_test/gcp_ubuntu/build.sh index 4a424c081a..1fd1abfd8d 100755 --- a/perfmetrics/scripts/continuous_test/gcp_ubuntu/build.sh +++ b/perfmetrics/scripts/continuous_test/gcp_ubuntu/build.sh @@ -60,7 +60,7 @@ run_ls_benchmark(){ cd "../" } -COMMON_MOUNT_FLAGS="--debug_fuse --debug_gcs --log-format \"text\"" +COMMON_MOUNT_FLAGS="--log-severity=trace --log-format \"text\"" # Testing for flat bucket. LOG_FILE_FIO_TESTS=${KOKORO_ARTIFACTS_DIR}/gcsfuse-logs-fio-flat.txt @@ -89,8 +89,8 @@ cd "./hns_rename_folders_metrics" # Rename perf tests are only performed daily on HNS bucket by default. LOG_FILE_RENAME_TESTS_HNS=${KOKORO_ARTIFACTS_DIR}/gcsfuse-logs-rename-hns.txt LOG_FILE_RENAME_TESTS_FLAT=${KOKORO_ARTIFACTS_DIR}/gcsfuse-logs-rename-flat.txt -GCSFUSE_HNS_FLAGS="--log-severity=trace --log-format \"text\" --log-file $LOG_FILE_RENAME_TESTS_HNS --stackdriver-export-interval=30s" -GCSFUSE_FLAT_FLAGS="--log-severity=trace --log-format \"text\" --log-file $LOG_FILE_RENAME_TESTS_FLAT --implicit-dirs --rename-dir-limit=1000000 --stackdriver-export-interval=30s" +GCSFUSE_HNS_FLAGS="$COMMON_MOUNT_FLAGS --log-file $LOG_FILE_RENAME_TESTS_HNS --stackdriver-export-interval=30s" +GCSFUSE_FLAT_FLAGS="$COMMON_MOUNT_FLAGS --log-file $LOG_FILE_RENAME_TESTS_FLAT --implicit-dirs --rename-dir-limit=1000000 --stackdriver-export-interval=30s" ./run_rename_benchmark.sh $GCSFUSE_HNS_FLAGS $GCSFUSE_FLAT_FLAGS $UPLOAD_FLAGS diff --git a/perfmetrics/scripts/hns_rename_folders_metrics/renaming_benchmark.py b/perfmetrics/scripts/hns_rename_folders_metrics/renaming_benchmark.py index 13d84fb356..16228ef53e 100644 --- a/perfmetrics/scripts/hns_rename_folders_metrics/renaming_benchmark.py +++ b/perfmetrics/scripts/hns_rename_folders_metrics/renaming_benchmark.py @@ -295,12 +295,14 @@ def _record_time_of_operation(mount_point, dir, num_samples): time_interval_for_vm_metrics={} # Collecting metrics for non-nested folders. for folder in dir["folders"]["folder_structure"]: + log.info("Testing started for {}".folder["name"]) results[folder["name"]],time_interval = _record_time_for_folder_rename(mount_point,folder,num_samples) time_interval_for_vm_metrics[folder["name"]]=[time_interval[0][0],time_interval[-1][-1]] nested_folder={ "name": dir["nested_folders"]["folder_name"] } + log.info("Testing started for {}".format(dir["nested_folders"]["folder_name"])) results[dir["nested_folders"]["folder_name"]],time_interval = _record_time_for_folder_rename(mount_point,nested_folder,num_samples) time_interval_for_vm_metrics[dir["nested_folders"]["folder_name"]]=[time_interval[0][0],time_interval[-1][-1]] return results,time_interval_for_vm_metrics @@ -500,10 +502,10 @@ def _run_rename_benchmark(test_type,dir_config,mount_flags,num_samples,upload_gs if __name__ == '__main__': argv = sys.argv - if len(argv) < 3: + if len(argv) < 4: raise TypeError('Incorrect number of arguments.\n' 'Usage: ' - 'python3 renaming_benchmark.py [--upload_gs] [--num_samples NUM_SAMPLES] config_file bucket_type') + 'python3 renaming_benchmark.py [--upload_gs] [--num_samples NUM_SAMPLES] config_file bucket_type mount_flags') args = _parse_arguments(argv) check_dependencies(['gcloud', 'gcsfuse'], log) diff --git a/perfmetrics/scripts/hns_rename_folders_metrics/run_rename_benchmark.sh b/perfmetrics/scripts/hns_rename_folders_metrics/run_rename_benchmark.sh index 8e57457e25..cb76a4796f 100755 --- a/perfmetrics/scripts/hns_rename_folders_metrics/run_rename_benchmark.sh +++ b/perfmetrics/scripts/hns_rename_folders_metrics/run_rename_benchmark.sh @@ -39,7 +39,7 @@ gsutil cp gs://periodic-perf-tests/creds.json ../gsheet/ echo "Upgrading gcloud version" ../upgrade_gcloud.sh -# Uncomment the following 2 lines to run the benchmark on flat bucket +# Uncomment the following 2 lines to run the benchmark on flat bucket. #echo "Running renaming benchmark on flat bucket" #python3 renaming_benchmark.py config-flat.json flat "$GCSFUSE_FLAT_FLAGS" "$UPLOAD_FLAGS"