Skip to content

Commit 264f14f

Browse files
committed
Rocksdb-Cloud backend - refactored code to make cloud storage plugin pluggable.
1 parent 197e0cb commit 264f14f

25 files changed

Lines changed: 1759 additions & 441 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,4 @@ codeium-instructions.md
119119
WARP.md
120120

121121
# Auto-generated by test scripts
122-
docker/HStore-On-S3/.generated/
122+
docker/cloud-storage/.generated/
Lines changed: 171 additions & 69 deletions
Large diffs are not rendered by default.
Lines changed: 63 additions & 63 deletions
Large diffs are not rendered by default.

docker/HStore-On-S3/test-rocksdb-cloud-distributed.sh renamed to docker/cloud-storage/test-rocksdb-cloud-distributed.sh

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ SERVER_PORT="${SERVER_PORT:-8080}"
4545
# Store cloud sync is required in this smoke test: each store writes SST updates to S3.
4646
STORE_ROCKSDB_CLOUD_ENABLED="${STORE_ROCKSDB_CLOUD_ENABLED:-true}"
4747
STORE_ROCKSDB_CLOUD_SYNC_INTERVAL_SECONDS="${STORE_ROCKSDB_CLOUD_SYNC_INTERVAL_SECONDS:-30}"
48-
# If true, each write commit waits for synchronous S3 upload before returning.
49-
STORE_ROCKSDB_CLOUD_S3_FIRST_MODE="${STORE_ROCKSDB_CLOUD_S3_FIRST_MODE:-true}"
48+
# If true, each write commit waits for synchronous cloud storage upload before returning.
49+
STORE_ROCKSDB_CLOUD_CLOUD_FIRST_MODE="${STORE_ROCKSDB_CLOUD_CLOUD_FIRST_MODE:-true}"
5050

5151
AUTO_BUILD_SERVER_IMAGE="${AUTO_BUILD_SERVER_IMAGE:-true}"
5252
AUTO_BUILD_STORE_IMAGE="${AUTO_BUILD_STORE_IMAGE:-true}"
@@ -376,16 +376,16 @@ services:
376376
HG_STORE_RAFT_ADDRESS: store0:8510
377377
HG_STORE_DATA_PATH: /hugegraph-store/storage
378378
HG_STORE_ROCKSDB_CLOUD_ENABLED: "${STORE_ROCKSDB_CLOUD_ENABLED}"
379-
HG_STORE_ROCKSDB_CLOUD_S3_BUCKET: "${S3_BUCKET_STORE0}"
380-
HG_STORE_ROCKSDB_CLOUD_S3_ENDPOINT: "${S3_ENDPOINT}"
381-
HG_STORE_ROCKSDB_CLOUD_S3_REGION: "${S3_REGION}"
382-
HG_STORE_ROCKSDB_CLOUD_S3_ACCESS_KEY: "${MINIO_ROOT_USER}"
383-
HG_STORE_ROCKSDB_CLOUD_S3_SECRET_KEY: "${MINIO_ROOT_PASSWORD}"
384-
HG_STORE_ROCKSDB_CLOUD_S3_PATH_STYLE: "true"
385-
HG_STORE_ROCKSDB_CLOUD_S3_OBJECT_PREFIX: ""
379+
HG_STORE_ROCKSDB_CLOUD_BUCKET: "${S3_BUCKET_STORE0}"
380+
HG_STORE_ROCKSDB_CLOUD_ENDPOINT: "${S3_ENDPOINT}"
381+
HG_STORE_ROCKSDB_CLOUD_REGION: "${S3_REGION}"
382+
HG_STORE_ROCKSDB_CLOUD_ACCESS_KEY: "${MINIO_ROOT_USER}"
383+
HG_STORE_ROCKSDB_CLOUD_SECRET_KEY: "${MINIO_ROOT_PASSWORD}"
384+
HG_STORE_ROCKSDB_CLOUD_PATH_STYLE: "true"
385+
HG_STORE_ROCKSDB_CLOUD_OBJECT_PREFIX: ""
386386
HG_STORE_ROCKSDB_CLOUD_SYNC_INTERVAL_SECONDS: "${STORE_ROCKSDB_CLOUD_SYNC_INTERVAL_SECONDS}"
387387
HG_STORE_ROCKSDB_CLOUD_SYNC_INCREMENTAL: "true"
388-
HG_STORE_ROCKSDB_CLOUD_S3_FIRST_MODE: "${STORE_ROCKSDB_CLOUD_S3_FIRST_MODE}"
388+
HG_STORE_ROCKSDB_CLOUD_CLOUD_FIRST_MODE: "${STORE_ROCKSDB_CLOUD_CLOUD_FIRST_MODE}"
389389
ports:
390390
- "8520:8520"
391391
volumes:
@@ -413,16 +413,16 @@ services:
413413
HG_STORE_RAFT_ADDRESS: store1:8510
414414
HG_STORE_DATA_PATH: /hugegraph-store/storage
415415
HG_STORE_ROCKSDB_CLOUD_ENABLED: "${STORE_ROCKSDB_CLOUD_ENABLED}"
416-
HG_STORE_ROCKSDB_CLOUD_S3_BUCKET: "${S3_BUCKET_STORE1}"
417-
HG_STORE_ROCKSDB_CLOUD_S3_ENDPOINT: "${S3_ENDPOINT}"
418-
HG_STORE_ROCKSDB_CLOUD_S3_REGION: "${S3_REGION}"
419-
HG_STORE_ROCKSDB_CLOUD_S3_ACCESS_KEY: "${MINIO_ROOT_USER}"
420-
HG_STORE_ROCKSDB_CLOUD_S3_SECRET_KEY: "${MINIO_ROOT_PASSWORD}"
421-
HG_STORE_ROCKSDB_CLOUD_S3_PATH_STYLE: "true"
422-
HG_STORE_ROCKSDB_CLOUD_S3_OBJECT_PREFIX: ""
416+
HG_STORE_ROCKSDB_CLOUD_BUCKET: "${S3_BUCKET_STORE1}"
417+
HG_STORE_ROCKSDB_CLOUD_ENDPOINT: "${S3_ENDPOINT}"
418+
HG_STORE_ROCKSDB_CLOUD_REGION: "${S3_REGION}"
419+
HG_STORE_ROCKSDB_CLOUD_ACCESS_KEY: "${MINIO_ROOT_USER}"
420+
HG_STORE_ROCKSDB_CLOUD_SECRET_KEY: "${MINIO_ROOT_PASSWORD}"
421+
HG_STORE_ROCKSDB_CLOUD_PATH_STYLE: "true"
422+
HG_STORE_ROCKSDB_CLOUD_OBJECT_PREFIX: ""
423423
HG_STORE_ROCKSDB_CLOUD_SYNC_INTERVAL_SECONDS: "${STORE_ROCKSDB_CLOUD_SYNC_INTERVAL_SECONDS}"
424424
HG_STORE_ROCKSDB_CLOUD_SYNC_INCREMENTAL: "true"
425-
HG_STORE_ROCKSDB_CLOUD_S3_FIRST_MODE: "${STORE_ROCKSDB_CLOUD_S3_FIRST_MODE}"
425+
HG_STORE_ROCKSDB_CLOUD_CLOUD_FIRST_MODE: "${STORE_ROCKSDB_CLOUD_CLOUD_FIRST_MODE}"
426426
ports:
427427
- "8521:8520"
428428
volumes:
@@ -450,16 +450,16 @@ services:
450450
HG_STORE_RAFT_ADDRESS: store2:8510
451451
HG_STORE_DATA_PATH: /hugegraph-store/storage
452452
HG_STORE_ROCKSDB_CLOUD_ENABLED: "${STORE_ROCKSDB_CLOUD_ENABLED}"
453-
HG_STORE_ROCKSDB_CLOUD_S3_BUCKET: "${S3_BUCKET_STORE2}"
454-
HG_STORE_ROCKSDB_CLOUD_S3_ENDPOINT: "${S3_ENDPOINT}"
455-
HG_STORE_ROCKSDB_CLOUD_S3_REGION: "${S3_REGION}"
456-
HG_STORE_ROCKSDB_CLOUD_S3_ACCESS_KEY: "${MINIO_ROOT_USER}"
457-
HG_STORE_ROCKSDB_CLOUD_S3_SECRET_KEY: "${MINIO_ROOT_PASSWORD}"
458-
HG_STORE_ROCKSDB_CLOUD_S3_PATH_STYLE: "true"
459-
HG_STORE_ROCKSDB_CLOUD_S3_OBJECT_PREFIX: ""
453+
HG_STORE_ROCKSDB_CLOUD_BUCKET: "${S3_BUCKET_STORE2}"
454+
HG_STORE_ROCKSDB_CLOUD_ENDPOINT: "${S3_ENDPOINT}"
455+
HG_STORE_ROCKSDB_CLOUD_REGION: "${S3_REGION}"
456+
HG_STORE_ROCKSDB_CLOUD_ACCESS_KEY: "${MINIO_ROOT_USER}"
457+
HG_STORE_ROCKSDB_CLOUD_SECRET_KEY: "${MINIO_ROOT_PASSWORD}"
458+
HG_STORE_ROCKSDB_CLOUD_PATH_STYLE: "true"
459+
HG_STORE_ROCKSDB_CLOUD_OBJECT_PREFIX: ""
460460
HG_STORE_ROCKSDB_CLOUD_SYNC_INTERVAL_SECONDS: "${STORE_ROCKSDB_CLOUD_SYNC_INTERVAL_SECONDS}"
461461
HG_STORE_ROCKSDB_CLOUD_SYNC_INCREMENTAL: "true"
462-
HG_STORE_ROCKSDB_CLOUD_S3_FIRST_MODE: "${STORE_ROCKSDB_CLOUD_S3_FIRST_MODE}"
462+
HG_STORE_ROCKSDB_CLOUD_CLOUD_FIRST_MODE: "${STORE_ROCKSDB_CLOUD_CLOUD_FIRST_MODE}"
463463
ports:
464464
- "8522:8520"
465465
volumes:

0 commit comments

Comments
 (0)