Skip to content

Commit c43d8ab

Browse files
gcloud: billing project settings
1 parent 6796f14 commit c43d8ab

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

contrib/offline-replay/offline_replay_template.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export AGAVE_LEDGER_TOOL="${AGAVE_REPO}/target/release/agave-ledger-tool"
1010

1111
# Network Specific Parameters
1212
export NETWORK="mainnet"
13+
export BILLING_PROJECT="billing-project-id"
1314
export SLACK_WEBHOOK_URL=https://hooks.slack.com/services/...
1415
export SLACK_MISMATCH_WEBHOOK_URL=https://hooks.slack.com/services/...
1516

contrib/offline-replay/run_offline_replay.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fi
4747
while true; do
4848
source $NETWORK_PARAMETERS_FILE $NETWORK
4949
echo "Updated network parameters"
50-
NEWEST_BUCKET=$(gcloud storage ls $BUCKET_ENDPOINT | sort -n -t / -k 4 | tail -n 1)
50+
NEWEST_BUCKET=$(gcloud storage ls $BUCKET_ENDPOINT --billing-project=$BILLING_PROJECT | sort -n -t / -k 4 | tail -n 1)
5151
NEWEST_BUCKET_SLOT=$(echo $NEWEST_BUCKET | awk -F'/' '{print $(NF-1)}')
5252
LATEST_RUN_BUCKET_SLOT=$(cat $LATEST_RUN_BUCKET_SLOT_FILE)
5353

@@ -82,15 +82,15 @@ while true; do
8282
send_slack_message "Rocksdb already exists at \`$LEDGER_DIR/rocksdb\`"
8383
else
8484
while true; do
85-
if gcloud storage ls ${SOLANA_BUCKET_PATH}/rocksdb.tar.zst | grep -q 'rocksdb.tar.zst'; then
85+
if gcloud storage ls ${SOLANA_BUCKET_PATH}/rocksdb.tar.zst --billing-project=$BILLING_PROJECT | grep -q 'rocksdb.tar.zst'; then
8686
send_slack_message "Rocksdb found. Starting to copy..."
8787
break
8888
else
8989
send_slack_message "Rocksdb not found. Checking again in 1 hour."
9090
sleep 3600
9191
fi
9292
done
93-
gcloud storage cp ${SOLANA_BUCKET_PATH}/rocksdb.tar.zst .
93+
gcloud storage cp ${SOLANA_BUCKET_PATH}/rocksdb.tar.zst . --billing-project=$BILLING_PROJECT
9494
zstd -d rocksdb.tar.zst && sleep 5 && rm -rf rocksdb.tar.zst
9595
tar -xf rocksdb.tar && sleep 5 && rm -rf rocksdb.tar
9696
send_slack_message "Downloaded rocksdb to \`$LEDGER_DIR/rocksdb\`"
@@ -104,9 +104,9 @@ while true; do
104104
HOURLY_SNAPSHOT_DIR=${SOLANA_BUCKET_PATH}/hourly
105105
echo "Hourly Snapshot Directory: $HOURLY_SNAPSHOT_DIR"
106106

107-
BASE_SNAPSHOT=$(gcloud storage ls "${SOLANA_BUCKET_PATH}/snapshot*.tar.zst" | sort -n -t - -k 3)
107+
BASE_SNAPSHOT=$(gcloud storage ls "${SOLANA_BUCKET_PATH}/snapshot*.tar.zst" --billing-project=$BILLING_PROJECT | sort -n -t - -k 3)
108108

109-
HOURLY_SNAPSHOTS=$(gcloud storage ls "${HOURLY_SNAPSHOT_DIR}" | sort -n -t - -k 3)
109+
HOURLY_SNAPSHOTS=$(gcloud storage ls "${HOURLY_SNAPSHOT_DIR}" --billing-project=$BILLING_PROJECT | sort -n -t - -k 3)
110110
SNAPSHOTS="${BASE_SNAPSHOT} ${HOURLY_SNAPSHOTS}"
111111

112112
CLOSEST_HOURLY_SLOT=${ROCKSDB_ROOTED_MAX}
@@ -136,7 +136,7 @@ while true; do
136136
send_slack_message "Hourly snapshot already exists at \`$LEDGER_DIR/$CLOSEST_HOURLY_FILENAME\`"
137137
else
138138
rm -f $LEDGER_DIR/snapshot*.tar.zst
139-
gcloud storage cp ${CLOSEST_HOURLY_URL} .
139+
gcloud storage cp ${CLOSEST_HOURLY_URL} . --billing-project=$BILLING_PROJECT
140140
send_slack_message "Downloaded hourly snapshot to \`$LEDGER_DIR/$CLOSEST_HOURLY_FILENAME\`"
141141
fi
142142

contrib/offline-replay/run_offline_replay_backtest.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ CURRENT_FAILURE_COUNT=0
4747
while true; do
4848
source $NETWORK_PARAMETERS_FILE $NETWORK
4949
echo "Updated network parameters"
50-
NEWEST_BUCKET=$(gcloud storage ls $BUCKET_ENDPOINT | sort -n -t / -k 4 | tail -n 1)
50+
NEWEST_BUCKET=$(gcloud storage ls $BUCKET_ENDPOINT --billing-project=$BILLING_PROJECT | sort -n -t / -k 4 | tail -n 1)
5151
NEWEST_BUCKET_SLOT=$(echo $NEWEST_BUCKET | awk -F'/' '{print $(NF-1)}')
5252
LATEST_RUN_BUCKET_SLOT=$(cat $LATEST_RUN_BUCKET_SLOT_FILE)
5353

@@ -83,15 +83,15 @@ while true; do
8383
send_slack_message "Rocksdb already exists at \`$LEDGER_DIR/rocksdb\`"
8484
else
8585
while true; do
86-
if gcloud storage ls ${SOLANA_BUCKET_PATH}/rocksdb.tar.zst | grep -q 'rocksdb.tar.zst'; then
86+
if gcloud storage ls ${SOLANA_BUCKET_PATH}/rocksdb.tar.zst --billing-project=$BILLING_PROJECT | grep -q 'rocksdb.tar.zst'; then
8787
send_slack_message "Rocksdb found. Starting to copy..."
8888
break
8989
else
9090
send_slack_message "Rocksdb not found. Checking again in 1 hour."
9191
sleep 3600
9292
fi
9393
done
94-
gcloud storage cp ${SOLANA_BUCKET_PATH}/rocksdb.tar.zst .
94+
gcloud storage cp ${SOLANA_BUCKET_PATH}/rocksdb.tar.zst . --billing-project=$BILLING_PROJECT
9595
zstd -d rocksdb.tar.zst && sleep 5 && rm -rf rocksdb.tar.zst
9696
tar -xf rocksdb.tar && sleep 5 && rm -rf rocksdb.tar
9797
send_slack_message "Downloaded rocksdb to \`$LEDGER_DIR/rocksdb\`"
@@ -105,9 +105,9 @@ while true; do
105105
HOURLY_SNAPSHOT_DIR=${SOLANA_BUCKET_PATH}/hourly
106106
echo "Hourly Snapshot Directory: $HOURLY_SNAPSHOT_DIR"
107107

108-
BASE_SNAPSHOT=$(gcloud storage ls "${SOLANA_BUCKET_PATH}/snapshot*.tar.zst" | sort -n -t - -k 3)
108+
BASE_SNAPSHOT=$(gcloud storage ls "${SOLANA_BUCKET_PATH}/snapshot*.tar.zst" --billing-project=$BILLING_PROJECT | sort -n -t - -k 3)
109109

110-
HOURLY_SNAPSHOTS=$(gcloud storage ls "${HOURLY_SNAPSHOT_DIR}" | sort -n -t - -k 3)
110+
HOURLY_SNAPSHOTS=$(gcloud storage ls "${HOURLY_SNAPSHOT_DIR}" --billing-project=$BILLING_PROJECT | sort -n -t - -k 3)
111111
SNAPSHOTS="${BASE_SNAPSHOT} ${HOURLY_SNAPSHOTS}"
112112

113113
CLOSEST_HOURLY_SLOT=${ROCKSDB_ROOTED_MAX}
@@ -137,7 +137,7 @@ while true; do
137137
send_slack_message "Hourly snapshot already exists at \`$LEDGER_DIR/$CLOSEST_HOURLY_FILENAME\`"
138138
else
139139
rm -f $LEDGER_DIR/snapshot*.tar.zst
140-
gcloud storage cp ${CLOSEST_HOURLY_URL} .
140+
gcloud storage cp ${CLOSEST_HOURLY_URL} . --billing-project=$BILLING_PROJECT
141141
send_slack_message "Downloaded hourly snapshot to \`$LEDGER_DIR/$CLOSEST_HOURLY_FILENAME\`"
142142
fi
143143

0 commit comments

Comments
 (0)