From 53700d396725a7dfc8743259a3014bce4ea432e8 Mon Sep 17 00:00:00 2001 From: Chen Zhao Date: Fri, 1 Aug 2025 14:03:29 +0800 Subject: [PATCH 1/6] use current_user instead of hardcode mono --- concourse/scripts/main.bash | 29 +++++++++++++++-------------- concourse/scripts/main.ent.bash | 31 ++++++++++++++++--------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/concourse/scripts/main.bash b/concourse/scripts/main.bash index ea1e1b8d0fe..505dbbb50bf 100755 --- a/concourse/scripts/main.bash +++ b/concourse/scripts/main.bash @@ -10,7 +10,8 @@ cd $WORKSPACE whoami pwd ls -sudo chown -R mono $PWD +current_user=$(whoami) +sudo chown -R $(current_user) $PWD # make coredump dir writable. if [ ! -d "/var/crash" ]; then sudo mkdir -p /var/crash; fi @@ -19,12 +20,12 @@ sudo chmod 777 /var/crash ulimit -c unlimited echo '/var/crash/core.%t.%e.%p' | sudo tee /proc/sys/kernel/core_pattern -sudo chown -R mono /home/mono/workspace -cd /home/mono/workspace +sudo chown -R $(current_user) /home/$(current_user)/workspace +cd /home/$(current_user)/workspace ln -s $WORKSPACE/eloqsql_src eloqsql ln -s $WORKSPACE/eloq_test_src eloq_test -cd /home/mono/workspace/eloqsql +cd /home/$(current_user)/workspace/eloqsql git submodule sync git submodule update --init --recursive @@ -117,14 +118,14 @@ sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" echo "dss_server.ini" cat $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini -cd /home/mono/workspace/eloqsql +cd /home/$(current_user)/workspace/eloqsql echo "configuring" if [ ! -d "bld" ]; then mkdir bld; fi cd bld if [ ! -f "Makefile" ]; then - cmake -DCMAKE_INSTALL_PREFIX="/home/mono/workspace/eloqsql/install" \ + cmake -DCMAKE_INSTALL_PREFIX="/home/$(current_user)/workspace/eloqsql/install" \ -DPLUGIN_{HANDLERSOCKET,ROCKSDB,ARIA,ARCHIVE,CVS,FEDERATEDX,TOKUDB,MROONGA,OQGRAPH,CONNECT,SPIDER,SPHINX,HEAP,MYISAMMRG}=NO \ -DCMAKE_BUILD_TYPE=Debug \ -DINSTALL_MYSQLTESTDIR="" \ @@ -152,24 +153,24 @@ echo "installing" cmake --install . --config Debug echo "building dss_server" -cd /home/mono/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service +cd /home/$(current_user)/workspace/eloqsql/storage/eloq/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 --build . --config Debug -j8 echo "installing dss_server" -cp dss_server /home/mono/workspace/eloqsql/install/bin/ +cp dss_server /home/$(current_user)/workspace/eloqsql/install/bin/ echo "building log_server" -cd /home/mono/workspace/eloqsql/storage/eloq/log_service +cd /home/$(current_user)/workspace/eloqsql/storage/eloq/log_service mkdir bld && cd bld cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DUSE_ROCKSDB_LOG_STATE=ON ../ cmake --build . --config Debug -j8 echo "installing launch_sv" -cp launch_sv /home/mono/workspace/eloqsql/install/bin/ +cp launch_sv /home/$(current_user)/workspace/eloqsql/install/bin/ echo "build finished" -cd /home/mono/workspace/eloq_test +cd /home/$(current_user)/workspace/eloq_test ./setup sed -i "s/eloq_aws_access_key_id.*=.\+/eloq_aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" ./bootstrap_cnf/*_s3.cnf sed -i "s/eloq_aws_secret_key.*=.\+/eloq_aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" ./bootstrap_cnf/*_s3.cnf @@ -199,9 +200,9 @@ mc rb minio_server/txlog-${bucket_name} --force set -e echo "running eloq_test" -# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/mono/workspace/eloqsql/install +# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/$(current_user)/workspace/eloqsql/install -cd /home/mono/workspace/eloqsql/bld/mysql-test +cd /home/$(current_user)/workspace/eloqsql/bld/mysql-test # Clean up minio buckets echo "cleaning minio buckets" @@ -233,7 +234,7 @@ cat $WORKSPACE/eloqsql_src/mysql-test/include/eloq_kv_dss.cnf # Start dss_server echo "starting dss_server" -nohup /home/mono/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & +nohup /home/$(current_user)/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & sleep 5 echo "running mono_multi" diff --git a/concourse/scripts/main.ent.bash b/concourse/scripts/main.ent.bash index c26a9cb1304..121523e1912 100755 --- a/concourse/scripts/main.ent.bash +++ b/concourse/scripts/main.ent.bash @@ -10,7 +10,8 @@ cd $WORKSPACE whoami pwd ls -sudo chown -R mono $PWD +current_user=$(whoami) +sudo chown -R $(current_user) $PWD # make coredump dir writable. if [ ! -d "/var/crash" ]; then sudo mkdir -p /var/crash; fi @@ -19,16 +20,16 @@ sudo chmod 777 /var/crash ulimit -c unlimited echo '/var/crash/core.%t.%e.%p' | sudo tee /proc/sys/kernel/core_pattern -sudo chown -R mono /home/mono/workspace -cd /home/mono/workspace +sudo chown -R $(current_user) /home/$(current_user)/workspace +cd /home/$(current_user)/workspace ln -s $WORKSPACE/eloqsql_src eloqsql ln -s $WORKSPACE/eloq_test_src eloq_test -cd /home/mono/workspace/eloqsql +cd /home/$(current_user)/workspace/eloqsql git submodule sync git submodule update --init --recursive -cd /home/mono/workspace/eloqsql/storage/eloq +cd /home/$(current_user)/workspace/eloqsql/storage/eloq ln -s $WORKSPACE/logservice_src eloq_log_service cd tx_service ln -s $WORKSPACE/raft_host_manager_src raft_host_manager @@ -125,14 +126,14 @@ sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" echo "dss_server.ini" cat $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini -cd /home/mono/workspace/eloqsql +cd /home/$(current_user)/workspace/eloqsql echo "configuring" if [ ! -d "bld" ]; then mkdir bld; fi cd bld if [ ! -f "Makefile" ]; then - cmake -DCMAKE_INSTALL_PREFIX="/home/mono/workspace/eloqsql/install" \ + cmake -DCMAKE_INSTALL_PREFIX="/home/$(current_user)/workspace/eloqsql/install" \ -DPLUGIN_{HANDLERSOCKET,ROCKSDB,ARIA,ARCHIVE,CVS,FEDERATEDX,TOKUDB,MROONGA,OQGRAPH,CONNECT,SPIDER,SPHINX,HEAP,MYISAMMRG}=NO \ -DCMAKE_BUILD_TYPE=Debug \ -DINSTALL_MYSQLTESTDIR="" \ @@ -163,24 +164,24 @@ echo "installing" cmake --install . --config Debug echo "building dss_server" -cd /home/mono/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service +cd /home/$(current_user)/workspace/eloqsql/storage/eloq/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 --build . --config Debug -j8 echo "installing dss_server" -cp dss_server /home/mono/workspace/eloqsql/install/bin/ +cp dss_server /home/$(current_user)/workspace/eloqsql/install/bin/ echo "building log_server" -cd /home/mono/workspace/eloqsql/storage/eloq/log_service +cd /home/$(current_user)/workspace/eloqsql/storage/eloq/log_service mkdir bld && cd bld cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DUSE_ROCKSDB_LOG_STATE=ON ../ cmake --build . --config Debug -j8 echo "installing launch_sv" -cp launch_sv /home/mono/workspace/eloqsql/install/bin/ +cp launch_sv /home/$(current_user)/workspace/eloqsql/install/bin/ echo "build finished" -cd /home/mono/workspace/eloq_test +cd /home/$(current_user)/workspace/eloq_test ./setup sed -i "s/eloq_aws_access_key_id.*=.\+/eloq_aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" ./bootstrap_cnf/*_s3.cnf sed -i "s/eloq_aws_secret_key.*=.\+/eloq_aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" ./bootstrap_cnf/*_s3.cnf @@ -210,9 +211,9 @@ mc rb ${minio_server_alias}/txlog-${bucket_name} --force set -e echo "running eloq_test" -# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/mono/workspace/eloqsql/install +# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/$(current_user)/workspace/eloqsql/install -cd /home/mono/workspace/eloqsql/bld/mysql-test +cd /home/$(current_user)/workspace/eloqsql/bld/mysql-test # Clean up minio buckets echo "cleaning minio buckets" @@ -244,7 +245,7 @@ cat $WORKSPACE/eloqsql_src/mysql-test/include/eloq_kv_dss.cnf # Start dss_server echo "starting dss_server" -nohup /home/mono/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & +nohup /home/$(current_user)/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & sleep 5 echo "running mono_multi" From bb27c34dec359fefb956fce170d81def612ef280 Mon Sep 17 00:00:00 2001 From: Chen Zhao Date: Fri, 1 Aug 2025 16:08:07 +0800 Subject: [PATCH 2/6] fix --- concourse/scripts/main.bash | 28 ++++++++++++++-------------- concourse/scripts/main.ent.bash | 30 +++++++++++++++--------------- concourse/scripts/my.cnf | 4 ++-- concourse/scripts/pr.ent.bash | 31 ++++++++++++++++--------------- 4 files changed, 47 insertions(+), 46 deletions(-) diff --git a/concourse/scripts/main.bash b/concourse/scripts/main.bash index 505dbbb50bf..2012278df86 100755 --- a/concourse/scripts/main.bash +++ b/concourse/scripts/main.bash @@ -11,7 +11,7 @@ whoami pwd ls current_user=$(whoami) -sudo chown -R $(current_user) $PWD +sudo chown -R $current_user $PWD # make coredump dir writable. if [ ! -d "/var/crash" ]; then sudo mkdir -p /var/crash; fi @@ -20,12 +20,12 @@ sudo chmod 777 /var/crash ulimit -c unlimited echo '/var/crash/core.%t.%e.%p' | sudo tee /proc/sys/kernel/core_pattern -sudo chown -R $(current_user) /home/$(current_user)/workspace -cd /home/$(current_user)/workspace +sudo chown -R $current_user /home/$current_user/workspace +cd /home/$current_user/workspace ln -s $WORKSPACE/eloqsql_src eloqsql ln -s $WORKSPACE/eloq_test_src eloq_test -cd /home/$(current_user)/workspace/eloqsql +cd /home/$current_user/workspace/eloqsql git submodule sync git submodule update --init --recursive @@ -118,14 +118,14 @@ sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" echo "dss_server.ini" cat $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini -cd /home/$(current_user)/workspace/eloqsql +cd /home/$current_user/workspace/eloqsql echo "configuring" if [ ! -d "bld" ]; then mkdir bld; fi cd bld if [ ! -f "Makefile" ]; then - cmake -DCMAKE_INSTALL_PREFIX="/home/$(current_user)/workspace/eloqsql/install" \ + cmake -DCMAKE_INSTALL_PREFIX="/home/$current_user/workspace/eloqsql/install" \ -DPLUGIN_{HANDLERSOCKET,ROCKSDB,ARIA,ARCHIVE,CVS,FEDERATEDX,TOKUDB,MROONGA,OQGRAPH,CONNECT,SPIDER,SPHINX,HEAP,MYISAMMRG}=NO \ -DCMAKE_BUILD_TYPE=Debug \ -DINSTALL_MYSQLTESTDIR="" \ @@ -153,24 +153,24 @@ echo "installing" cmake --install . --config Debug echo "building dss_server" -cd /home/$(current_user)/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service +cd /home/$current_user/workspace/eloqsql/storage/eloq/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 --build . --config Debug -j8 echo "installing dss_server" -cp dss_server /home/$(current_user)/workspace/eloqsql/install/bin/ +cp dss_server /home/$current_user/workspace/eloqsql/install/bin/ echo "building log_server" -cd /home/$(current_user)/workspace/eloqsql/storage/eloq/log_service +cd /home/$current_user/workspace/eloqsql/storage/eloq/log_service mkdir bld && cd bld cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DUSE_ROCKSDB_LOG_STATE=ON ../ cmake --build . --config Debug -j8 echo "installing launch_sv" -cp launch_sv /home/$(current_user)/workspace/eloqsql/install/bin/ +cp launch_sv /home/$current_user/workspace/eloqsql/install/bin/ echo "build finished" -cd /home/$(current_user)/workspace/eloq_test +cd /home/$current_user/workspace/eloq_test ./setup sed -i "s/eloq_aws_access_key_id.*=.\+/eloq_aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" ./bootstrap_cnf/*_s3.cnf sed -i "s/eloq_aws_secret_key.*=.\+/eloq_aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" ./bootstrap_cnf/*_s3.cnf @@ -200,9 +200,9 @@ mc rb minio_server/txlog-${bucket_name} --force set -e echo "running eloq_test" -# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/$(current_user)/workspace/eloqsql/install +# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/$current_user/workspace/eloqsql/install -cd /home/$(current_user)/workspace/eloqsql/bld/mysql-test +cd /home/$current_user/workspace/eloqsql/bld/mysql-test # Clean up minio buckets echo "cleaning minio buckets" @@ -234,7 +234,7 @@ cat $WORKSPACE/eloqsql_src/mysql-test/include/eloq_kv_dss.cnf # Start dss_server echo "starting dss_server" -nohup /home/$(current_user)/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & +nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & sleep 5 echo "running mono_multi" diff --git a/concourse/scripts/main.ent.bash b/concourse/scripts/main.ent.bash index 121523e1912..7aadab3e690 100755 --- a/concourse/scripts/main.ent.bash +++ b/concourse/scripts/main.ent.bash @@ -11,7 +11,7 @@ whoami pwd ls current_user=$(whoami) -sudo chown -R $(current_user) $PWD +sudo chown -R $current_user $PWD # make coredump dir writable. if [ ! -d "/var/crash" ]; then sudo mkdir -p /var/crash; fi @@ -20,16 +20,16 @@ sudo chmod 777 /var/crash ulimit -c unlimited echo '/var/crash/core.%t.%e.%p' | sudo tee /proc/sys/kernel/core_pattern -sudo chown -R $(current_user) /home/$(current_user)/workspace -cd /home/$(current_user)/workspace +sudo chown -R $current_user /home/$current_user/workspace +cd /home/$current_user/workspace ln -s $WORKSPACE/eloqsql_src eloqsql ln -s $WORKSPACE/eloq_test_src eloq_test -cd /home/$(current_user)/workspace/eloqsql +cd /home/$current_user/workspace/eloqsql git submodule sync git submodule update --init --recursive -cd /home/$(current_user)/workspace/eloqsql/storage/eloq +cd /home/$current_user/workspace/eloqsql/storage/eloq ln -s $WORKSPACE/logservice_src eloq_log_service cd tx_service ln -s $WORKSPACE/raft_host_manager_src raft_host_manager @@ -126,14 +126,14 @@ sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" echo "dss_server.ini" cat $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini -cd /home/$(current_user)/workspace/eloqsql +cd /home/$current_user/workspace/eloqsql echo "configuring" if [ ! -d "bld" ]; then mkdir bld; fi cd bld if [ ! -f "Makefile" ]; then - cmake -DCMAKE_INSTALL_PREFIX="/home/$(current_user)/workspace/eloqsql/install" \ + cmake -DCMAKE_INSTALL_PREFIX="/home/$current_user/workspace/eloqsql/install" \ -DPLUGIN_{HANDLERSOCKET,ROCKSDB,ARIA,ARCHIVE,CVS,FEDERATEDX,TOKUDB,MROONGA,OQGRAPH,CONNECT,SPIDER,SPHINX,HEAP,MYISAMMRG}=NO \ -DCMAKE_BUILD_TYPE=Debug \ -DINSTALL_MYSQLTESTDIR="" \ @@ -164,24 +164,24 @@ echo "installing" cmake --install . --config Debug echo "building dss_server" -cd /home/$(current_user)/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service +cd /home/$current_user/workspace/eloqsql/storage/eloq/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 --build . --config Debug -j8 echo "installing dss_server" -cp dss_server /home/$(current_user)/workspace/eloqsql/install/bin/ +cp dss_server /home/$current_user/workspace/eloqsql/install/bin/ echo "building log_server" -cd /home/$(current_user)/workspace/eloqsql/storage/eloq/log_service +cd /home/$current_user/workspace/eloqsql/storage/eloq/log_service mkdir bld && cd bld cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DUSE_ROCKSDB_LOG_STATE=ON ../ cmake --build . --config Debug -j8 echo "installing launch_sv" -cp launch_sv /home/$(current_user)/workspace/eloqsql/install/bin/ +cp launch_sv /home/$current_user/workspace/eloqsql/install/bin/ echo "build finished" -cd /home/$(current_user)/workspace/eloq_test +cd /home/$current_user/workspace/eloq_test ./setup sed -i "s/eloq_aws_access_key_id.*=.\+/eloq_aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" ./bootstrap_cnf/*_s3.cnf sed -i "s/eloq_aws_secret_key.*=.\+/eloq_aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" ./bootstrap_cnf/*_s3.cnf @@ -211,9 +211,9 @@ mc rb ${minio_server_alias}/txlog-${bucket_name} --force set -e echo "running eloq_test" -# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/$(current_user)/workspace/eloqsql/install +# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/$current_user/workspace/eloqsql/install -cd /home/$(current_user)/workspace/eloqsql/bld/mysql-test +cd /home/$current_user/workspace/eloqsql/bld/mysql-test # Clean up minio buckets echo "cleaning minio buckets" @@ -245,7 +245,7 @@ cat $WORKSPACE/eloqsql_src/mysql-test/include/eloq_kv_dss.cnf # Start dss_server echo "starting dss_server" -nohup /home/$(current_user)/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & +nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & sleep 5 echo "running mono_multi" diff --git a/concourse/scripts/my.cnf b/concourse/scripts/my.cnf index 589ce05ea79..bbeffd96f3a 100644 --- a/concourse/scripts/my.cnf +++ b/concourse/scripts/my.cnf @@ -1,7 +1,7 @@ [mariadb] plugin_maturity=experimental -datadir=/home/mono/mariadbdata0 -lc_messages_dir=/home/mono/workspace/mariadb/sql/share +datadir=/home/eloq/mariadbdata0 +lc_messages_dir=/home/eloq/workspace/mariadb/sql/share max_connections=500 skip-log-bin innodb_flush_method=fsync diff --git a/concourse/scripts/pr.ent.bash b/concourse/scripts/pr.ent.bash index e971e6d150b..83e624096bb 100755 --- a/concourse/scripts/pr.ent.bash +++ b/concourse/scripts/pr.ent.bash @@ -9,7 +9,8 @@ cd $WORKSPACE whoami pwd ls -sudo chown -R mono $PWD +current_user=$(who) +sudo chown -R $current_user $PWD # make coredump dir writable. if [ ! -d "/var/crash" ]; then sudo mkdir -p /var/crash; fi @@ -18,17 +19,17 @@ sudo chmod 777 /var/crash ulimit -c unlimited echo '/var/crash/core.%t.%e.%p' | sudo tee /proc/sys/kernel/core_pattern -sudo chown -R mono /home/mono/workspace -cd /home/mono/workspace +sudo chown -R $current_user /home/$current_user/workspace +cd /home/$current_user/workspace ln -s $WORKSPACE/eloqsql_pr eloqsql ln -s $WORKSPACE/eloq_test_src eloq_test -cd /home/mono/workspace/eloqsql +cd /home/$current_user/workspace/eloqsql git submodule sync git submodule update --init --recursive pr_branch_name=$(cat .git/resource/metadata.json | jq -r '.[] | select(.name=="head_name") | .value') -cd /home/mono/workspace/eloqsql/storage/eloq +cd /home/$current_user/workspace/eloqsql/storage/eloq ln -s $WORKSPACE/logservice_src eloq_log_service cd eloq_log_service @@ -134,14 +135,14 @@ sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g" echo "dss_server.ini" cat $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini -cd /home/mono/workspace/eloqsql +cd /home/$current_user/workspace/eloqsql echo "configuring" if [ ! -d "bld" ]; then mkdir bld; fi cd bld if [ ! -f "Makefile" ]; then - cmake -DCMAKE_INSTALL_PREFIX="/home/mono/workspace/eloqsql/install" \ + cmake -DCMAKE_INSTALL_PREFIX="/home/$current_user/workspace/eloqsql/install" \ -DPLUGIN_{HANDLERSOCKET,ROCKSDB,ARIA,ARCHIVE,CVS,FEDERATEDX,TOKUDB,MROONGA,OQGRAPH,CONNECT,SPIDER,SPHINX,HEAP,MYISAMMRG}=NO \ -DCMAKE_BUILD_TYPE=Debug \ -DINSTALL_MYSQLTESTDIR="" \ @@ -172,24 +173,24 @@ echo "installing" cmake --install . --config Debug echo "building dss_server" -cd /home/mono/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service +cd /home/$current_user/workspace/eloqsql/storage/eloq/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 --build . --config Debug -j8 echo "installing dss_server" -cp dss_server /home/mono/workspace/eloqsql/install/bin/ +cp dss_server /home/$current_user/workspace/eloqsql/install/bin/ echo "building log_server" -cd /home/mono/workspace/eloqsql/storage/eloq/eloq_log_service +cd /home/$current_user/workspace/eloqsql/storage/eloq/eloq_log_service mkdir bld && cd bld cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DUSE_ROCKSDB_LOG_STATE=ON -DWITH_ROCKSDB_CLOUD=S3 ../ cmake --build . --config Debug -j8 echo "installing launch_sv" -cp launch_sv /home/mono/workspace/eloqsql/install/bin/ +cp launch_sv /home/$current_user/workspace/eloqsql/install/bin/ echo "build finished" -cd /home/mono/workspace/eloq_test +cd /home/$current_user/workspace/eloq_test ./setup sed -i "s/eloq_aws_access_key_id.*=.\+/eloq_aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" ./bootstrap_cnf/*_s3.cnf sed -i "s/eloq_aws_secret_key.*=.\+/eloq_aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" ./bootstrap_cnf/*_s3.cnf @@ -219,9 +220,9 @@ mc rb ${minio_server_alias}/txlog-${bucket_name} --force set -e echo "running eloq_test" -# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/mono/workspace/eloqsql/install +# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/$current_user/workspace/eloqsql/install -cd /home/mono/workspace/eloqsql/bld/mysql-test +cd /home/$current_user/workspace/eloqsql/bld/mysql-test # Clean up minio buckets echo "cleaning minio buckets" @@ -253,7 +254,7 @@ cat $WORKSPACE/eloqsql_pr/mysql-test/include/eloq_kv_dss.cnf # Start dss_server echo "starting dss_server" -nohup /home/mono/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & +nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & sleep 5 echo "running mono_multi" From c60ba0a11fdf5215ca836bad3d86c9e8d1cff466 Mon Sep 17 00:00:00 2001 From: Chen Zhao Date: Mon, 4 Aug 2025 13:45:35 +0800 Subject: [PATCH 3/6] fix --- concourse/scripts/pr.ent.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concourse/scripts/pr.ent.bash b/concourse/scripts/pr.ent.bash index 83e624096bb..f6841688c65 100755 --- a/concourse/scripts/pr.ent.bash +++ b/concourse/scripts/pr.ent.bash @@ -9,7 +9,7 @@ cd $WORKSPACE whoami pwd ls -current_user=$(who) +current_user=$(whoami) sudo chown -R $current_user $PWD # make coredump dir writable. From 84572156ade1c8d95772e1a2953487ad9dd183ae Mon Sep 17 00:00:00 2001 From: Chen Zhao Date: Mon, 4 Aug 2025 14:41:46 +0800 Subject: [PATCH 4/6] change yaml --- concourse/pipeline/main.ent.yml | 8 ++++---- concourse/pipeline/main.yml | 8 ++++---- concourse/pipeline/pr.ent.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/concourse/pipeline/main.ent.yml b/concourse/pipeline/main.ent.yml index f8360aa5952..260fc5babc9 100644 --- a/concourse/pipeline/main.ent.yml +++ b/concourse/pipeline/main.ent.yml @@ -30,10 +30,10 @@ resources: uri: git@github.com:eloqdata/raft_host_manager.git private_key: ((git-key)) -- name: mono_ubuntu_2204 +- name: eloq_ubuntu_2404 type: registry-image source: - repository: monographdb/monograph-dev-ci-ubuntu2204 + repository: eloqdata/monograph-dev-ci-ubuntu2404 username: monographdb password: ((docker-secret-key)) @@ -53,9 +53,9 @@ jobs: trigger: true - get: eloq_test_src trigger: true - - get: mono_ubuntu_2204 + - get: eloq_ubuntu_2404 - task: compile-test-task - image: mono_ubuntu_2204 + image: eloq_ubuntu_2404 file: eloqsql_src/concourse/tasks/main.ent.yml params: ELOQ_AWS_ACCESS_KEY_ID: ((minio-access-key)) diff --git a/concourse/pipeline/main.yml b/concourse/pipeline/main.yml index 616c917b68b..38a2cf08431 100644 --- a/concourse/pipeline/main.yml +++ b/concourse/pipeline/main.yml @@ -14,10 +14,10 @@ resources: uri: git@github.com:eloqdata/eloq-test.git private_key: ((git-key)) -- name: mono_ubuntu_2204 +- name: eloq_ubuntu_2404 type: registry-image source: - repository: monographdb/monograph-dev-ci-ubuntu2204 + repository: eloqdata/monograph-dev-ci-ubuntu2404 username: monographdb password: ((docker_hub_pass)) @@ -33,9 +33,9 @@ jobs: trigger: true - get: eloq_test_src trigger: true - - get: mono_ubuntu_2204 + - get: eloq_ubuntu_2404 - task: compile-test-task - image: mono_ubuntu_2204 + image: eloq_ubuntu_2404 file: eloqsql_src/concourse/tasks/main.yml params: ELOQ_AWS_ACCESS_KEY_ID: ((minio-access-key)) diff --git a/concourse/pipeline/pr.ent.yml b/concourse/pipeline/pr.ent.yml index 67feb43d952..bde006ff010 100644 --- a/concourse/pipeline/pr.ent.yml +++ b/concourse/pipeline/pr.ent.yml @@ -37,10 +37,10 @@ resources: uri: git@github.com:eloqdata/raft_host_manager.git private_key: ((git-key)) -- name: mono_ubuntu_2004 +- name: eloq_ubuntu_2404 type: registry-image source: - repository: monographdb/monograph-dev-ci-ubuntu2004 + repository: eloqdata/monograph-dev-ci-ubuntu2004 username: monographdb password: ((docker-secret-key)) @@ -58,13 +58,13 @@ jobs: - get: eloqsql_pr trigger: true version: every - - get: mono_ubuntu_2004 + - get: eloq_ubuntu_2404 - put: eloqsql_pr params: path: eloqsql_pr status: pending - task: compile-test-task - image: mono_ubuntu_2004 + image: eloq_ubuntu_2404 file: eloqsql_pr/concourse/tasks/pr.ent.yml params: ELOQ_AWS_ACCESS_KEY_ID: ((minio-access-key)) From b68a855375d71753d3cb7b6aec8ea107aa1b9311 Mon Sep 17 00:00:00 2001 From: Chen Zhao Date: Mon, 4 Aug 2025 15:02:44 +0800 Subject: [PATCH 5/6] fix --- concourse/pipeline/pr.ent.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concourse/pipeline/pr.ent.yml b/concourse/pipeline/pr.ent.yml index bde006ff010..76c592d6420 100644 --- a/concourse/pipeline/pr.ent.yml +++ b/concourse/pipeline/pr.ent.yml @@ -40,7 +40,7 @@ resources: - name: eloq_ubuntu_2404 type: registry-image source: - repository: eloqdata/monograph-dev-ci-ubuntu2004 + repository: eloqdata/monograph-dev-ci-ubuntu2404 username: monographdb password: ((docker-secret-key)) From 7b32250fa2d1808da0f9f5521a928494c4fffb6a Mon Sep 17 00:00:00 2001 From: Chen Zhao Date: Mon, 4 Aug 2025 17:30:44 +0800 Subject: [PATCH 6/6] format format --- storage/eloq/ha_eloq.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/storage/eloq/ha_eloq.cc b/storage/eloq/ha_eloq.cc index 4ed3c9aeee3..0e252853f39 100644 --- a/storage/eloq/ha_eloq.cc +++ b/storage/eloq/ha_eloq.cc @@ -159,7 +159,7 @@ #if (defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB_CLOUD_S3) || \ defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB_CLOUD_GCS) || \ - defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB) || \ + defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB) || \ defined(DATA_STORE_TYPE_ELOQDSS_ELOQSTORE)) #define ELOQDS 1 #endif @@ -2528,9 +2528,9 @@ static int eloq_init_func(void *p) (opt_bootstrap || is_single_node), enable_cache_replacement_, shard_id, data_store_service_.get()); #elif defined(DATA_STORE_TYPE_ELOQDSS_ROCKSDB) - auto ds= std::make_unique( - rocksdb_config, (opt_bootstrap || is_single_node), enable_cache_replacement_, - shard_id, data_store_service_.get()); + auto ds= std::make_unique( + rocksdb_config, (opt_bootstrap || is_single_node), + enable_cache_replacement_, shard_id, data_store_service_.get()); #elif defined(DATA_STORE_TYPE_ELOQDSS_ELOQSTORE) DLOG(INFO) << "worker: " << eloq_store_config.worker_count_ << ", path: " << eloq_store_config.storage_path_