Skip to content

Commit 817b092

Browse files
committed
chore(bootstrap): bootstrap does not replace existing Columnstore.xml if the flag is set
1 parent 07c2e51 commit 817b092

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

build/bootstrap_mcs.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,11 @@ construct_cmake_flags() {
390390
MDB_CMAKE_FLAGS+=(-DDEB=${CODENAME})
391391
fi
392392

393+
if [[ "$NO_CLEAN" == true ]]; then
394+
message "Skipping Columnstore.etc config installation"
395+
MDB_CMAKE_FLAGS+=(-DSKIP_CONFIG_INSTALLATION=ON)
396+
fi
397+
393398
MDB_CMAKE_FLAGS+=($CUSTOM_CMAKE_FLAGS)
394399

395400
message "Building with flags"
@@ -619,8 +624,10 @@ install() {
619624

620625
make_dir /etc/columnstore
621626

622-
cp "$MDB_SOURCE_PATH"/storage/columnstore/columnstore/oam/etc/Columnstore.xml /etc/columnstore/Columnstore.xml
623-
cp "$MDB_SOURCE_PATH"/storage/columnstore/columnstore/storage-manager/storagemanager.cnf /etc/columnstore/storagemanager.cnf
627+
if [[ "$NO_CLEAN" == false ]]; then
628+
cp "$MDB_SOURCE_PATH"/storage/columnstore/columnstore/oam/etc/Columnstore.xml /etc/columnstore/Columnstore.xml
629+
cp "$MDB_SOURCE_PATH"/storage/columnstore/columnstore/storage-manager/storagemanager.cnf /etc/columnstore/storagemanager.cnf
630+
fi
624631

625632
cp "$MDB_SOURCE_PATH"/storage/columnstore/columnstore/oam/install_scripts/*.service /lib/systemd/system/
626633

oam/etc/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
columnstore_install_file(Columnstore.xml ${ENGINE_SYSCONFDIR}/columnstore)
1+
if(NOT SKIP_CONFIG_INSTALLATION)
2+
columnstore_install_file(Columnstore.xml ${ENGINE_SYSCONFDIR}/columnstore)
3+
endif()

0 commit comments

Comments
 (0)