diff --git a/perfkitbenchmarker/providers/gcp/gcp_dpb_dataproc_serverless_prices.py b/perfkitbenchmarker/providers/gcp/gcp_dpb_dataproc_serverless_prices.py index f20170ec44..6de0396c25 100644 --- a/perfkitbenchmarker/providers/gcp/gcp_dpb_dataproc_serverless_prices.py +++ b/perfkitbenchmarker/providers/gcp/gcp_dpb_dataproc_serverless_prices.py @@ -8,138 +8,138 @@ DATAPROC_SERVERLESS_PRICES = { 'us-west1': { 'usd_per_milli_dcu_sec': 0.06 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.04 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.04 / 720 / 3600, }, 'us-west2': { 'usd_per_milli_dcu_sec': 0.072071 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.048 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.048 / 720 / 3600, }, 'us-west3': { 'usd_per_milli_dcu_sec': 0.072071 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.048 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.048 / 720 / 3600, }, 'us-west4': { 'usd_per_milli_dcu_sec': 0.067572 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.044 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.044 / 720 / 3600, }, 'us-east1': { 'usd_per_milli_dcu_sec': 0.06 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.04 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.04 / 720 / 3600, }, 'us-east4': { 'usd_per_milli_dcu_sec': 0.067572 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.044 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.044 / 720 / 3600, }, 'us-east5': { 'usd_per_milli_dcu_sec': 0.06 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.04 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.04 / 720 / 3600, }, 'us-central1': { 'usd_per_milli_dcu_sec': 0.06 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.04 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.04 / 720 / 3600, }, 'us-south1': { 'usd_per_milli_dcu_sec': 0.0708 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.0472 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.0472 / 720 / 3600, }, 'europe-north1': { 'usd_per_milli_dcu_sec': 0.066062 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.044 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.044 / 720 / 3600, }, 'europe-west1': { 'usd_per_milli_dcu_sec': 0.066007 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.04 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.04 / 720 / 3600, }, 'europe-west2': { 'usd_per_milli_dcu_sec': 0.077307 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.048 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.048 / 720 / 3600, }, 'europe-west3': { 'usd_per_milli_dcu_sec': 0.077307 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.048 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.048 / 720 / 3600, }, 'europe-west4': { 'usd_per_milli_dcu_sec': 0.066057 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.044 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.044 / 720 / 3600, }, 'europe-west6': { 'usd_per_milli_dcu_sec': 0.083955 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.052 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.052 / 720 / 3600, }, 'europe-west8': { 'usd_per_milli_dcu_sec': 0.0696 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.0464 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.0464 / 720 / 3600, }, 'europe-west9': { 'usd_per_milli_dcu_sec': 0.0696 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.0464 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.0464 / 720 / 3600, }, 'europe-central2': { 'usd_per_milli_dcu_sec': 0.077307 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.048 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.048 / 720 / 3600, }, 'europe-southwest1': { 'usd_per_milli_dcu_sec': 0.0708 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.047 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.047 / 720 / 3600, }, 'asia-northeast1': { 'usd_per_milli_dcu_sec': 0.076976 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.052 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.052 / 720 / 3600, }, 'asia-northeast2': { 'usd_per_milli_dcu_sec': 0.076976 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.052 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.052 / 720 / 3600, }, 'asia-northeast3': { 'usd_per_milli_dcu_sec': 0.076976 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.052 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.052 / 720 / 3600, }, 'asia-east1': { 'usd_per_milli_dcu_sec': 0.069477 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.04 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.04 / 720 / 3600, }, 'asia-east2': { 'usd_per_milli_dcu_sec': 0.083955 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.05 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.05 / 720 / 3600, }, 'asia-south1': { 'usd_per_milli_dcu_sec': 0.072071 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.048 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.048 / 720 / 3600, }, 'asia-south2': { 'usd_per_milli_dcu_sec': 0.072071 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.048 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.048 / 720 / 3600, }, 'asia-southeast1': { 'usd_per_milli_dcu_sec': 0.074015 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.044 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.044 / 720 / 3600, }, 'asia-southeast2': { 'usd_per_milli_dcu_sec': 0.080674 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.052 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.052 / 720 / 3600, }, 'australia-southeast1': { 'usd_per_milli_dcu_sec': 0.085135 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.054 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.054 / 720 / 3600, }, 'australia-southeast2': { 'usd_per_milli_dcu_sec': 0.085135 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.054 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.054 / 720 / 3600, }, 'northamerica-northeast1': { 'usd_per_milli_dcu_sec': 0.066057 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.044 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.044 / 720 / 3600, }, 'northamerica-northeast2': { 'usd_per_milli_dcu_sec': 0.066057 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.044 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.044 / 720 / 3600, }, 'southamerica-east1': { 'usd_per_milli_dcu_sec': 0.095246 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.06 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.06 / 720 / 3600, }, 'southamerica-west1': { 'usd_per_milli_dcu_sec': 0.08581 / 1000 / 3600, - 'usd_per_shuffle_storage_gb_sec': 0.057 / 744 / 3600, + 'usd_per_shuffle_storage_gb_sec': 0.057 / 720 / 3600, }, }