Skip to content

Ci with eloqstore #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
githubzilla merged 26 commits into from
Jan 16, 2026
Merged

Ci with eloqstore #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d8bac9f
Update data_substrate
githubzilla Dec 5, 2025
363d781
Merge remote-tracking branch 'upstream/eloq-10.6.10' into eloq-10.6.10
githubzilla Dec 9, 2025
9e5d1e8
Merge remote-tracking branch 'upstream/eloq-10.6.10' into eloq-10.6.10
githubzilla Dec 11, 2025
c4245ee
Merge remote-tracking branch 'upstream/eloq-10.6.10' into eloq-10.6.10
githubzilla Dec 12, 2025
74850e0
Merge remote-tracking branch 'upstream/eloq-10.6.10' into eloq-10.6.10
githubzilla Dec 24, 2025
04fd052
Merge remote-tracking branch 'upstream/eloq-10.6.10' into eloq-10.6.10
githubzilla Jan 12, 2026
e685b42
Merge remote-tracking branch 'upstream/eloq-10.6.10' into eloq-10.6.10
githubzilla Jan 14, 2026
73bd404
init commit
githubzilla Jan 13, 2026
8cbb613
Limit eloq_store_open_files_limit
githubzilla Jan 14, 2026
67aca91
Update CI script
githubzilla Jan 14, 2026
a94cae5
Update data_substrate
githubzilla Jan 14, 2026
d987c75
Update build script
githubzilla Jan 14, 2026
dcb73a6
Add debug log
githubzilla Jan 15, 2026
c10d87d
Add reuse_local_files for mtr test
githubzilla Jan 15, 2026
c446000
Update ds cnf
githubzilla Jan 15, 2026
2d2d399
update eloq_store_cloud_store_path
githubzilla Jan 15, 2026
2b09b9f
Update pr script
githubzilla Jan 16, 2026
e73774e
remove hard coded eloq_config
githubzilla Jan 16, 2026
ba6e027
Update pr test script
githubzilla Jan 16, 2026
f707208
Disable mdev-21101, since we don't support resize thread_pool_size
githubzilla Jan 16, 2026
e17851d
Fix duplicated dss build
githubzilla Jan 16, 2026
82827bf
Refine eloq_system_handler.cpp
githubzilla Jan 16, 2026
d318bde
Remove space around = in cnf files
githubzilla Jan 16, 2026
4d02505
Remove space around = in cnf files
githubzilla Jan 16, 2026
a3a5777
Replace ak/sk
githubzilla Jan 16, 2026
a73ba76
Make threadpool_size readonly variable
githubzilla Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions concourse/scripts/dss_server.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ event_dispatcher_num=1
#auto_redirect=true

[store]
rocksdb_cloud_bucket_prefix=dss-
rocksdb_cloud_bucket_name=eloqsql-mtr-test
rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
aws_access_key_id=XXXXXXXXXXXXXXXXX
aws_secret_key=XXXXXXXXXXXXXXXXXXXXXXXX
eloq_store_open_files_limit=256
eloq_store_cloud_endpoint=http://127.0.0.1:9900
eloq_store_cloud_store_path=dss-eloqsql-mtr-test/eloqstore
eloq_store_cloud_access_key=XXXXXX
eloq_store_cloud_secret_key=XXXXXX
33 changes: 16 additions & 17 deletions concourse/scripts/main.ent.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ update_config_template() {
echo "Warning: Config file $config_file does not exist"
return 1
fi

# ak/sk
sed -i "s/aws_access_key_id.*=.\+/aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" "$config_file"
sed -i "s/aws_secret_key.*=.\+/aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" "$config_file"
# OSS settings
sed -i "s|rocksdb_cloud_s3_endpoint_url.*=.\+|rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" "$config_file"
sed -i "s|txlog_rocksdb_cloud_s3_endpoint_url.*=.\+|txlog_rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" "$config_file"
sed -i "s/rocksdb_cloud_bucket_name.*=.\+/rocksdb_cloud_bucket_name=${bucket_name}/g" "$config_file"
sed -i "s/txlog_rocksdb_cloud_bucket_name.*=.\+/txlog_rocksdb_cloud_bucket_name=${bucket_name}/g" "$config_file"
sed -i "s/rocksdb_cloud_region.*=.\+/rocksdb_cloud_region=${ELOQ_AWS_REGION}/g" "$config_file"
sed -i "s/eloq_store_cloud_access_key.*=.\+/eloq_store_cloud_access_key=${ELOQ_AWS_ACCESS_KEY_ID}/g" "$config_file"
sed -i "s/eloq_store_cloud_secret_key.*=.\+/eloq_store_cloud_secret_key=${ELOQ_AWS_SECRET_KEY}/g" "$config_file"

# txlog
sed -i "s/txlog_rocksdb_cloud_region.*=.\+/txlog_rocksdb_cloud_region=${ELOQ_AWS_REGION}/g" "$config_file"
sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" "$config_file"
sed -i "s/txlog_rocksdb_cloud_bucket_prefix.*=.\+/txlog_rocksdb_cloud_bucket_prefix=txlog-/g" "$config_file"
sed -i "s|eloq_dss_config_file_path.*=.\+|eloq_dss_config_file_path=${WORKSPACE}/eloqsql_src/concourse/scripts/dss_config.example.ini|g" "$config_file"
sed -i "s|txlog_rocksdb_cloud_object_store_service_url.*=.\+|txlog_rocksdb_cloud_object_store_service_url=${MINIO_ENDPOINT_URL}/txlog-${bucket_name}/txlog|g" "$config_file"

# eloqstore
sed -i "s|eloq_store_cloud_endpoint.*=.\+|eloq_store_cloud_endpoint=${MINIO_ENDPOINT_URL}|g" "$config_file"
sed -i "s|eloq_store_cloud_store_path.*=.\+|eloq_store_cloud_store_path=dss-${bucket_name}/eloqstore|g" "$config_file"
}

# config data_substrate.cnf
Expand Down Expand Up @@ -100,11 +100,10 @@ cat $WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap_ds.cnf
sed -i "s/ip.*=.\+/ip=localhost/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/port.*=.\+/port=9100/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/data_path.*=.\+/data_path=dss_data/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/aws_access_key_id.*=.\+/aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/aws_secret_key.*=.\+/aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s|rocksdb_cloud_s3_endpoint_url.*=.\+|rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/rocksdb_cloud_bucket_name.*=.\+/rocksdb_cloud_bucket_name=${bucket_name}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/eloq_store_cloud_access_key.*=.\+/eloq_store_cloud_access_key =${ELOQ_AWS_ACCESS_KEY_ID}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/eloq_store_cloud_secret_key.*=.\+/eloq_store_cloud_secret_key=${ELOQ_AWS_SECRET_KEY}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s|eloq_store_cloud_endpoint.*=.\+|eloq_store_cloud_endpoint=${MINIO_ENDPOINT_URL}|g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s|eloq_store_cloud_store_path.*=.\+|eloq_store_cloud_store_path=dss-${bucket_name}/eloqstore|g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini

echo "dss_server.ini"
cat $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
Expand All @@ -129,7 +128,7 @@ if [ ! -f "Makefile" ]; then
-DEXT_TX_PROC_ENABLED=ON \
-DMARIA_WITH_GLOG=ON \
-DSTATISTICS=ON \
-DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 \
-DWITH_DATA_STORE=ELOQDSS_ELOQSTORE \
-DOPEN_LOG_SERVICE=OFF \
-DFORK_HM_PROCESS=ON \
-DWITH_LOG_STATE=ROCKSDB_CLOUD_S3 \
Expand All @@ -148,7 +147,7 @@ cmake --install . --config Debug
echo "building dss_server"
cd /home/$current_user/workspace/eloqsql/data_substrate/store_handler/eloq_data_store_service
mkdir bld && cd bld
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 ../
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ELOQSTORE ../
cmake --build . --config Debug -j8
echo "installing dss_server"
cp dss_server /home/$current_user/workspace/eloqsql/install/bin/
Expand Down
2 changes: 1 addition & 1 deletion concourse/scripts/mtr_bootstrap.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ thread_pool_size=1
thread_pool_oversubscribe=10
thread_pool_dedicated_listener=1

eloq_config=
eloq_config=
26 changes: 12 additions & 14 deletions concourse/scripts/mtr_bootstrap_ds.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,20 @@ txlog_rocksdb_scan_threads=3
hm_bin_path=../../bld/data_substrate/host_manager
tx_ip=127.0.0.1
tx_port=8000
txlog_rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
txlog_rocksdb_cloud_bucket_name = eloqsql-mtr-test
txlog_rocksdb_cloud_bucket_prefix = txlog-
txlog_rocksdb_cloud_region = ap-northeast-1
txlog_rocksdb_cloud_region=ap-northeast-1
txlog_rocksdb_cloud_object_store_service_url=http://127.0.0.1:9900/txlog-eloqsql-mtr-test/txlog

[cluster]
tx_ip_port_list=127.0.0.1:8000

[store]
dynamodb_endpoint=http://127.0.0.1:8000
bigtable_project_id=XXXXXXXX
bigtable_instance_id=XXXXXXXX
aws_access_key_id=XXXXXXXXXX
aws_secret_key=XXXXXXXXXXXXXXXXXXXXX
rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
rocksdb_cloud_bucket_name = eloqsql-mtr-test
rocksdb_cloud_bucket_prefix = dss-
rocksdb_cloud_region = ap-northeast-1
eloq_dss_config_file_path =
aws_access_key_id=XXXXXX
aws_secret_key=XXXXXX

eloq_store_open_files_limit=256
eloq_store_buffer_pool_size=500MB
eloq_store_cloud_endpoint=http://127.0.0.1:9900
eloq_store_cloud_store_path=dss-eloqsql-mtr-test/eloqstore
eloq_store_cloud_access_key=XXXXXX
eloq_store_cloud_secret_key=XXXXXX
eloq_store_reuse_local_files=true
2 changes: 1 addition & 1 deletion concourse/scripts/mtr_multi_bootstrap.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ thread_pool_size=1
thread_pool_oversubscribe=10
thread_pool_dedicated_listener=1

eloq_config=
eloq_config=
22 changes: 7 additions & 15 deletions concourse/scripts/mtr_multi_bootstrap_ds.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,16 @@ txlog_rocksdb_scan_threads=3
hm_bin_path=../../bld/data_substrate/host_manager
tx_ip=127.0.0.1
tx_port=8000
txlog_rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
txlog_rocksdb_cloud_bucket_name = eloqsql-mtr-test
txlog_rocksdb_cloud_bucket_prefix = txlog-
txlog_rocksdb_cloud_region = ap-northeast-1
txlog_rocksdb_cloud_region=ap-northeast-1
txlog_rocksdb_cloud_object_store_service_url=http://127.0.0.1:9900/txlog-eloqsql-mtr-test/txlog

[cluster]
tx_ip_port_list=127.0.0.1:8000,127.0.0.1:8010,127.0.0.1:8020

[store]
dynamodb_endpoint=http://127.0.0.1:8000
bigtable_project_id=XXXXXXXX
bigtable_instance_id=XXXXXXXX
aws_access_key_id=XXXXXXXXXX
aws_secret_key=XXXXXXXXXXXXXXXXXXXXX
rocksdb_cloud_s3_endpoint_url=http://127.0.0.1:9900
rocksdb_cloud_bucket_name = eloqsql-mtr-test
rocksdb_cloud_bucket_prefix = dss-
rocksdb_cloud_region = ap-northeast-1
eloq_dss_config_file_path =
eloq_dss_peer_node = localhost:9100
aws_access_key_id=XXXXXX
aws_secret_key=XXXXXX

eloq_dss_config_file_path=
eloq_dss_peer_node=localhost:9100

56 changes: 28 additions & 28 deletions concourse/scripts/pr.ent.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,20 @@ update_config_template() {
echo "Warning: Config file $config_file does not exist"
return 1
fi

# ak/sk
sed -i "s/aws_access_key_id.*=.\+/aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" "$config_file"
sed -i "s/aws_secret_key.*=.\+/aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" "$config_file"
# OSS settings
sed -i "s|rocksdb_cloud_s3_endpoint_url.*=.\+|rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" "$config_file"
sed -i "s|txlog_rocksdb_cloud_s3_endpoint_url.*=.\+|txlog_rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" "$config_file"
sed -i "s/rocksdb_cloud_bucket_name.*=.\+/rocksdb_cloud_bucket_name=${bucket_name}/g" "$config_file"
sed -i "s/txlog_rocksdb_cloud_bucket_name.*=.\+/txlog_rocksdb_cloud_bucket_name=${bucket_name}/g" "$config_file"
sed -i "s/rocksdb_cloud_region.*=.\+/rocksdb_cloud_region=${ELOQ_AWS_REGION}/g" "$config_file"
sed -i "s/eloq_store_cloud_access_key.*=.\+/eloq_store_cloud_access_key=${ELOQ_AWS_ACCESS_KEY_ID}/g" "$config_file"
sed -i "s/eloq_store_cloud_secret_key.*=.\+/eloq_store_cloud_secret_key=${ELOQ_AWS_SECRET_KEY}/g" "$config_file"

# txlog
sed -i "s/txlog_rocksdb_cloud_region.*=.\+/txlog_rocksdb_cloud_region=${ELOQ_AWS_REGION}/g" "$config_file"
sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" "$config_file"
sed -i "s/txlog_rocksdb_cloud_bucket_prefix.*=.\+/txlog_rocksdb_cloud_bucket_prefix=txlog-/g" "$config_file"
sed -i "s|eloq_dss_config_file_path.*=.\+|eloq_dss_config_file_path=${WORKSPACE}/eloqsql_pr/concourse/scripts/dss_config.example.ini|g" "$config_file"
sed -i "s|txlog_rocksdb_cloud_object_store_service_url.*=.\+|txlog_rocksdb_cloud_object_store_service_url=${MINIO_ENDPOINT_URL}/txlog-${bucket_name}/txlog|g" "$config_file"

# eloqstore
sed -i "s|eloq_store_cloud_endpoint.*=.\+|eloq_store_cloud_endpoint=${MINIO_ENDPOINT_URL}|g" "$config_file"
sed -i "s|eloq_store_cloud_store_path.*=.\+|eloq_store_cloud_store_path=dss-${bucket_name}/eloqstore|g" "$config_file"
}

# config data_substrate.cnf
Expand All @@ -103,29 +103,29 @@ cat $WORKSPACE/eloqsql_pr/storage/eloq/mysql-test/mono_multi/data_substrate2.cnf
cat $WORKSPACE/eloqsql_pr/storage/eloq/mysql-test/mono_multi/data_substrate3.cnf

# config mtr_bootstrap.cnf
update_config_template "$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf"
sed -i "s|eloq_config=.*|eloq_config=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf|g" $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap.cnf
sed -i "s|hm_bin_path=.*|hm_bin_path=$WORKSPACE/eloqsql_pr/bld/data_substrate/host_manager|g" $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf
update_config_template "$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf"
sed -i "s|eloq_config=.*|eloq_config=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf|g" $WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf
sed -i "s|hm_bin_path=.*|hm_bin_path=$WORKSPACE/eloqsql_src/bld/data_substrate/host_manager|g" $WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf
echo "mtr_bootstrap_ds.cnf"
cat $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf
cat $WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf

#config mtr_multi_bootstrap.cnf
update_config_template "$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap_ds.cnf"
sed -i "s|eloq_config=.*|eloq_config=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap_ds.cnf|g" $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap.cnf
sed -i "s|hm_bin_path=.*|hm_bin_path=$WORKSPACE/eloqsql_pr/bld/data_substrate/host_manager|g" $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap_ds.cnf
update_config_template "$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap_ds.cnf"
sed -i "s|eloq_config=.*|eloq_config=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap_ds.cnf|g" $WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap.cnf
sed -i "s|hm_bin_path=.*|hm_bin_path=$WORKSPACE/eloqsql_src/bld/data_substrate/host_manager|g" $WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap_ds.cnf
echo "mtr_multi_bootstrap_ds.cnf"
cat $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap_ds.cnf
cat $WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap_ds.cnf
Comment on lines 105 to +117
Copy link

@coderabbitai coderabbitai bot Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Config edits now target eloqsql_src while tests still use eloqsql_pr.

These edits update configs under eloqsql_src, but later commands (e.g., the MTR bootstrap and dss_server config usage) still reference eloqsql_pr, so the configs actually used by tests may remain unmodified. Please align all config edits and runtime references to the same root.

If the PR flow should continue using eloqsql_pr, consider switching these paths back:

🔧 Possible fix (align to eloqsql_pr) 
-update_config_template "$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf"
-sed -i "s|eloq_config=.*|eloq_config=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf|g" $WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf
-sed -i "s|hm_bin_path=.*|hm_bin_path=$WORKSPACE/eloqsql_src/bld/data_substrate/host_manager|g" $WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap_ds.cnf
+update_config_template "$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf"
+sed -i "s|eloq_config=.*|eloq_config=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf|g" $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap.cnf
+sed -i "s|hm_bin_path=.*|hm_bin_path=$WORKSPACE/eloqsql_pr/bld/data_substrate/host_manager|g" $WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap_ds.cnf
🤖 Prompt for AI Agents 
In `@concourse/scripts/pr.ent.bash` around lines 105 - 117, The config edits in
pr.ent.bash update templates and sed replacements under eloqsql_src
(update_config_template for mtr_bootstrap_ds.cnf and mtr_multi_bootstrap_ds.cnf
and the sed lines that set eloq_config and hm_bin_path), but later runtime/test
steps still reference eloqsql_pr; to fix, choose one root and make all
references consistent—either change these occurrences of
"$WORKSPACE/eloqsql_src/..." to "$WORKSPACE/eloqsql_pr/..." (for
mtr_bootstrap_ds.cnf, mtr_multi_bootstrap_ds.cnf and hm_bin_path) or update the
downstream MTR/bootstrap and dss_server invocation to point at eloqsql_src;
ensure the same variable/root is used for update_config_template, the sed
replacements (eloq_config and hm_bin_path), and any later test/runtime
references so the configs actually used by tests are the ones you edited.


#config dss_server.ini
# ak/sk
sed -i "s/ip.*=.\+/ip=localhost/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
sed -i "s/port.*=.\+/port=9100/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
sed -i "s/data_path.*=.\+/data_path=dss_data/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
sed -i "s/aws_access_key_id.*=.\+/aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
sed -i "s/aws_secret_key.*=.\+/aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
sed -i "s|rocksdb_cloud_s3_endpoint_url.*=.\+|rocksdb_cloud_s3_endpoint_url=${MINIO_ENDPOINT_URL}|g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
sed -i "s/rocksdb_cloud_bucket_name.*=.\+/rocksdb_cloud_bucket_name=${bucket_name}/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
sed -i "s/ip.*=.\+/ip=localhost/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/port.*=.\+/port=9100/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/data_path.*=.\+/data_path=dss_data/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/eloq_store_cloud_access_key.*=.\+/eloq_store_cloud_access_key =${ELOQ_AWS_ACCESS_KEY_ID}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s/eloq_store_cloud_secret_key.*=.\+/eloq_store_cloud_secret_key=${ELOQ_AWS_SECRET_KEY}/g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s|eloq_store_cloud_endpoint.*=.\+|eloq_store_cloud_endpoint=${MINIO_ENDPOINT_URL}|g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
sed -i "s|eloq_store_cloud_store_path.*=.\+|eloq_store_cloud_store_path=dss-${bucket_name}/eloqstore|g" $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini


echo "dss_server.ini"
cat $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
Expand All @@ -150,7 +150,7 @@ if [ ! -f "Makefile" ]; then
-DEXT_TX_PROC_ENABLED=ON \
-DMARIA_WITH_GLOG=ON \
-DSTATISTICS=ON \
-DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 \
-DWITH_DATA_STORE=ELOQDSS_ELOQSTORE \
-DOPEN_LOG_SERVICE=OFF \
-DFORK_HM_PROCESS=ON \
-DWITH_LOG_STATE=ROCKSDB_CLOUD_S3 \
Expand All @@ -169,7 +169,7 @@ cmake --install . --config Debug
echo "building dss_server"
cd /home/$current_user/workspace/eloqsql/data_substrate/store_handler/eloq_data_store_service
mkdir bld && cd bld
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 ../
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ELOQSTORE ../
cmake --build . --config Debug -j8
echo "installing dss_server"
cp dss_server /home/$current_user/workspace/eloqsql/install/bin/
Expand Down
2 changes: 1 addition & 1 deletion data_substrate
Open in desktop
Submodule data_substrate updated 1 files
+2 −1 store_handler/data_store_service_client.cpp
Loading