diff --git a/perfmetrics/scripts/bigquery/experiments_gcsfuse_bq.py b/perfmetrics/scripts/bigquery/experiments_gcsfuse_bq.py index 84e3e4e5f7..8512012d0f 100644 --- a/perfmetrics/scripts/bigquery/experiments_gcsfuse_bq.py +++ b/perfmetrics/scripts/bigquery/experiments_gcsfuse_bq.py @@ -293,7 +293,7 @@ def get_experiment_configuration_id(self, gcsfuse_flags, branch, end_date, confi else: row = list(job)[0] # If the configuration name exists, but GCSFuse flags and branch don't match then raise an exception - if row.get('gcsfuse_flags') is not gcsfuse_flags or row.get('branch') is not branch: + if (row.get('gcsfuse_flags') != gcsfuse_flags) or (row.get('branch') != branch): raise Exception("Configuration name already exists. GCSFuse flags and branch don't match") config_id = row.get('configuration_id') # If the configuration name exists and GCSFuse flags and branch match, but end date does not match, then update end date diff --git a/perfmetrics/scripts/continuous_test/gcp_ubuntu/periodic_experiments/build.sh b/perfmetrics/scripts/continuous_test/gcp_ubuntu/periodic_experiments/build.sh index ccf1ee5303..b3a301d59a 100755 --- a/perfmetrics/scripts/continuous_test/gcp_ubuntu/periodic_experiments/build.sh +++ b/perfmetrics/scripts/continuous_test/gcp_ubuntu/periodic_experiments/build.sh @@ -55,7 +55,7 @@ export PYTHONPATH="./" echo Installing requirements.. pip install --require-hashes -r bigquery/requirements.txt --user -CONFIG_ID=$(eval "python3 bigquery/get_experiments_config.py --gcsfuse_flags '$GCSFUSE_FLAGS' --branch '$BRANCH' --end_date '$END_DATE' --config_name '$CONFIG_NAME'") +CONFIG_ID=$(eval "python3 -m bigquery.get_experiments_config --gcsfuse_flags '$GCSFUSE_FLAGS' --branch '$BRANCH' --end_date '$END_DATE' --config_name '$CONFIG_NAME'") START_TIME_BUILD=$(date +%s) UPLOAD_FLAGS="" diff --git a/perfmetrics/scripts/continuous_test/gcp_ubuntu/periodic_experiments/experiments_configuration.json b/perfmetrics/scripts/continuous_test/gcp_ubuntu/periodic_experiments/experiments_configuration.json index c4521bc424..264ac1ddac 100644 --- a/perfmetrics/scripts/continuous_test/gcp_ubuntu/periodic_experiments/experiments_configuration.json +++ b/perfmetrics/scripts/continuous_test/gcp_ubuntu/periodic_experiments/experiments_configuration.json @@ -4,25 +4,25 @@ "config_name": "EnabledStorageClientLibrary", "gcsfuse_flags": "--implicit-dirs --enable-storage-client-library --debug_fuse --debug_gcs", "branch": "master", - "end_date": "2023-12-30 05:30:00" + "end_date": "2023-12-30 05:30:00+00:00" }, { "config_name": "DisabledStorageClientLibrary", "gcsfuse_flags": "--implicit-dirs --enable-storage-client-library=false --debug_fuse --debug_gcs", "branch": "master", - "end_date": "2023-12-30 05:30:00" + "end_date": "2023-12-30 05:30:00+00:00" }, { "config_name": "EnabledStorageClientLibraryProtocolHTTP2", "gcsfuse_flags": "--implicit-dirs --enable-storage-client-library --client-protocol http2 --debug_fuse --debug_gcs", "branch": "experiments_dashboard", - "end_date": "2023-12-30 05:30:00" + "end_date": "2023-12-30 05:30:00+00:00" }, { "config_name": "MaxConnsPerHost40", "gcsfuse_flags": "--implicit-dirs --max-conns-per-host 40 --debug_fuse --debug_gcs", "branch": "experiments_dashboard", - "end_date": "2023-12-30 05:30:00" + "end_date": "2023-12-30 05:30:00+00:00" } ] } \ No newline at end of file diff --git a/perfmetrics/scripts/gsheet/gsheet.py b/perfmetrics/scripts/gsheet/gsheet.py index 10c79f087b..e1a2e5d69c 100644 --- a/perfmetrics/scripts/gsheet/gsheet.py +++ b/perfmetrics/scripts/gsheet/gsheet.py @@ -2,7 +2,7 @@ from googleapiclient.discovery import build SCOPES = ['https://www.googleapis.com/auth/spreadsheets'] -# TODO (ruchiksharmaa): This code uses a test gsheet, with modified fields. +# TODO (ruchikasharmaa): This code uses a test gsheet, with modified fields. # Before merging to master, we need to change the columns of original sheet. SPREADSHEET_ID = '1T5ZSUAAYqANS_MUjS2KR2XGN4DhgMFS8zF2I4E8WN4o' diff --git a/perfmetrics/scripts/vm_metrics/vm_metrics.py b/perfmetrics/scripts/vm_metrics/vm_metrics.py index c9a30066b7..036a088faf 100644 --- a/perfmetrics/scripts/vm_metrics/vm_metrics.py +++ b/perfmetrics/scripts/vm_metrics/vm_metrics.py @@ -28,7 +28,9 @@ from gsheet import gsheet from typing import List -PROJECT_NAME = 'projects/gcs-fuse-test-ml' +# TODO (ruchikasharmaa): Changed project name to gcs-fuse-test for running periodic experiments. +# Before merging to master, we need to resolve the conflicts. +PROJECT_NAME = 'projects/gcs-fuse-test' CPU_UTI_METRIC_TYPE = 'compute.googleapis.com/instance/cpu/utilization' RECEIVED_BYTES_COUNT_METRIC_TYPE = 'compute.googleapis.com/instance/network/received_bytes_count' OPS_LATENCY_METRIC_TYPE = 'custom.googleapis.com/gcsfuse/fs/ops_latency'