The data backup and recovery functions have been added

Author: wuxianrong

.github/workflows/pika.yml

@@ -16,261 +16,75 @@ jobs:
     # The CMake configure and build commands are platform-agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
-      - name: Free Disk Space (Ubuntu Host)
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /usr/local/lib/android
-          sudo rm -rf /opt/ghc
-          sudo rm -rf /opt/hostedtoolcache/CodeQL
-          sudo docker system prune -af
       - uses: actions/checkout@v4
 
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.19
-
-      - name: ccache
-        uses: hendrikmuhs/[email protected]
-        with:
-          key: ubuntu-latest
-
-      - name: Install Deps
+      - name: Build Docker image
         run: |
-          sudo apt-get update
-          sudo apt-get install -y autoconf libprotobuf-dev protobuf-compiler clang-tidy
-
-      - name: Configure CMake
-        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-        run: cmake -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DUSE_PIKA_TOOLS=ON -DCMAKE_CXX_FLAGS_DEBUG=-fsanitize=address -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
+          docker build -t pika-ci -f ci/Dockerfile .
 
-      - name: Build
-        # Build your program with the given configuration
-        run: cmake --build build --config ${{ env.BUILD_TYPE }}
-
-      - name: Cleanup
+      - name: Build Pika (inside Docker)
         run: |
-          rm -rf ./buildtrees
+          docker run --rm \
+            -v ${{ github.workspace }}:/work \
+            -w /work \
+            pika-ci \
+            bash -c "
+              rm -rf build buildtrees &&
+              cmake -B build \
+                -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+                -DUSE_PIKA_TOOLS=ON &&
+              cmake --build build -j$(nproc)
+            "
 
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.ARTIFACT_PIKA_NAME }}
-          path: ${{ github.workspace }}/build/pika
-
-      - name: Test
-        working-directory: ${{ github.workspace }}/build
-        # Execute tests defined by the CMake configuration.
-        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: ctest -C ${{ env.BUILD_TYPE }}
-
-      - name: Unit Test
-        working-directory: ${{ github.workspace }}
-        run: ./pikatests.sh all clean
-
-        # master on port 9221, slave on port 9231, all with 2 db
-      - name: Start codis, pika master and pika slave
-        working-directory: ${{ github.workspace }}/build
+      - name: Run CTest (inside Docker)
         run: |
-          chmod +x ../tests/integration/start_master_and_slave.sh
-          ../tests/integration/start_master_and_slave.sh
-          chmod +x ../tests/integration/start_codis.sh
-          ../tests/integration/start_codis.sh
+          docker run --rm \
+            -v ${{ github.workspace }}:/work \
+            -w /work/build \
+            pika-ci \
+            ctest --output-on-failure
 
-      - name: Run Go E2E Tests
-        working-directory: ${{ github.workspace }}/build
+      - name: Unit Test
         run: |
-          cd ../tools/pika_keys_analysis/
-          go test -v ./...
-          cd ../../tests/integration/
-          chmod +x integrate_test.sh
-          sh integrate_test.sh
-
+          docker run --rm \
+            -v ${{ github.workspace }}:/work \
+            -w /work \
+            pika-ci \
+            bash -c "./pikatests.sh all clean"
+  
   build_on_rocky:
-    runs-on: ubuntu-latest
-    container:
-      image: rockylinux:9
-
+    runs-on: ubuntu-22.04
     steps:
-      - name: set up mirror
-        run: |
-          rm -rf /etc/yum.repos.d/CentOS-Base.repo 
-          cat > /etc/yum.repos.d/CentOS-Base.repo << EOL
-          [base]
-          name=CentOS-\$releasever - Base
-          baseurl=https://mirrors.aliyun.com/centos-vault/7.9.2009/os/\$basearch/
-          gpgcheck=1
-          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-          
-          [updates]
-          name=CentOS-\$releasever - Updates
-          baseurl=https://mirrors.aliyun.com/centos-vault/7.9.2009/updates/\$basearch/
-          gpgcheck=1
-          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-          
-          [extras]
-          name=CentOS-\$releasever - Extras
-          baseurl=https://mirrors.aliyun.com/centos-vault/7.9.2009/extras/\$basearch/
-          gpgcheck=1
-          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-          
-          [centosplus]
-          name=CentOS-\$releasever - Plus
-          baseurl=https://mirrors.aliyun.com/centos-vault/7.9.2009/centosplus/\$basearch/
-          gpgcheck=1
-          enabled=0
-          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-          EOL
-          
-          cat > /etc/yum.repos.d/CentOS-SCLo-scl.repo << EOL
-          [centos-sclo-sclo]
-          name=CentOS-7 - SCLo sclo
-          baseurl=https://mirrors.aliyun.com/centos/7/sclo/x86_64/sclo/
-          gpgcheck=1
-          enabled=1
-          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
-          
-          [centos-sclo-sclo-source]
-          name=CentOS-7 - SCLo sclo Source
-          baseurl=https://mirrors.aliyun.com/centos/7/sclo/Source/sclo/
-          gpgcheck=1
-          enabled=0
-          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
-          EOL
-          
-          cat > /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo << EOL
-          [centos-sclo-rh]
-          name=CentOS-7 - SCLo rh
-          baseurl=https://mirrors.aliyun.com/centos/7/sclo/x86_64/rh/
-          gpgcheck=1
-          enabled=1
-          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
-          
-          [centos-sclo-rh-source]
-          name=CentOS-7 - SCLo rh Source
-          baseurl=https://mirrors.aliyun.com/centos/7/sclo/Source/rh/
-          gpgcheck=1
-          enabled=0
-          gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
-          EOL
-          
-          rpm --import https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7
-          rpm --import https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-SCLo
-          
-          yum clean all
-          yum makecache
-
-      - name: Install deps
-        run: |
-          dnf update -y
-          dnf install -y bash cmake wget git autoconf gcc perl-Digest-SHA tcl which tar g++ tar epel-release gcc-c++ libstdc++-devel gcc-toolset-13 binutils
-          dnf clean all
-          rm -rf /var/cache/dnf
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.19
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Configure CMake
-        run: |
-          source /opt/rh/gcc-toolset-13/enable
-          cmake -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DUSE_PIKA_TOOLS=ON -DCMAKE_CXX_FLAGS_DEBUG=-fsanitize=address .
-
-      - uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/deps
-          key: ${{ runner.os }}-rocky-deps-${{ hashFiles('**/CMakeLists.txt') }}
-
-      - uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/buildtrees
-          key: ${{ runner.os }}-rocky-buildtrees-${{ hashFiles('**/CMakeLists.txt') }}
-
-      - name: Build
-        run: |
-          source /opt/rh/gcc-toolset-13/enable
-          cmake --build build --config ${{ env.BUILD_TYPE }}
-
-      - name: Cleanup
-        run: |
-          rm -rf ./buildtrees
-          rm -rf ./build/Testing
-          rm -rf ./deps/src ./deps/include ./deps/share
-
-          echo "Cleaning up object files to save space..."
-          find ./build -name "*.o" -type f -delete
-          find ./build -name "*.a" -type f -delete
-          find ./build -name "*.pb.cc" -type f -delete
-          find ./build -name "*.pb.h" -type f -delete
-
-          echo "Stripping debug symbols from binaries..."
-          find ./build -type f -executable -not -name "*.sh" -exec strip --strip-debug {} \; || true
-          rm -rf .git
-          rm -rf include
-          rm -rf docs
-          rm -rf tools/codis_to_pika tools/aof_to_pika tools/binlog_sender
-          rm -rf codis/ansible codis/example codis/doc
-
-      - name: Test
-        working-directory: ${{ github.workspace }}/build
-        run: ctest -C ${{ env.BUILD_TYPE }}
-
-      - name: Unit Test
-        working-directory: ${{ github.workspace }}
-        run: ./pikatests.sh all clean
-
-      - name: Cleanup artifacts
-        working-directory: ${{ github.workspace }}/build
-        run: |
-          df -h
-          rm -rf Testing CMakeFiles CMakeCache.txt cmake_install.cmake Makefile
-          find . -name "*.o" -o -name "*.a" -delete
-          find . -name "*.log" -delete
-          find . -name "*.cmake" -delete
-          find . -type d -name "CMakeFiles" -exec rm -rf {} + || true
-          find . -name "*.pb.cc" -o -name "*.pb.h" -delete || true
-          find . -type f -name "*_test" -executable -delete || true
-          find ./src/storage/tests -type f -perm -111 -delete || true
-          find ../deps -name "*.a" -delete
-
-          go clean -cache -testcache -modcache
-          rm -rf /root/.cache/go-build /root/go/pkg/mod
-          rm -rf ../log ../pika_log ../dump ../*.log ../dbsync ../db[0-9]* ../log[0-9]*
-          find ../src -name "*.o" -delete || true
-          dnf clean all
-          rm -rf /var/cache/dnf /tmp/* /var/tmp/*
-          du -h --max-depth=3 .. | sort -hr | head -n 20
-          find .. -type f -exec du -h {} + | sort -hr | head -n 20
-          du -h --max-depth=1 / | sort -hr | head -n 15
-          df -h
-
-      - name: Start codis, pika master and pika slave
-        working-directory: ${{ github.workspace }}/build
-        run: |
-          chmod +x ../tests/integration/start_master_and_slave.sh
-          ../tests/integration/start_master_and_slave.sh
-          chmod +x ../tests/integration/start_codis.sh
-          ../tests/integration/start_codis.sh
-
-      - name: Run Go E2E Tests
-        working-directory: ${{ github.workspace }}/build
-        run: |
-          find . -name "pika.conf" -exec sed -i 's/loglevel : info/loglevel : error/g' {} +
-          find . -name "pika.conf" -exec sed -i 's/loglevel : debug/loglevel : error/g' {} +
-          cd ../tools/pika_keys_analysis/
-          go test -v ./...
-          cd ../../tests/integration/
-          chmod +x integrate_test.sh
-          sh integrate_test.sh
+    - uses: actions/checkout@v4
+
+    - name: Build Docker image for Rocky CI
+      run: |
+        docker build -t pika-rocky-ci -f ci/Dockerfile-rocky .
+
+    - name: Run build inside container
+      run: |
+        docker run --rm \
+          -v ${{ github.workspace }}:/work \
+          -w /work \
+          pika-rocky-ci \
+          bash -c "rm -rf build buildtrees && cmake -B build -DCMAKE_BUILD_TYPE=Release -DUSE_PIKA_TOOLS=ON && cmake --build build -j2"
+    - name: Run CTest (inside Docker)
+        run: |
+          docker run --rm \
+            -v ${{ github.workspace }}:/work \
+            -w /work/build \
+            pika-ci \
+            ctest --output-on-failure
+    - name: Unit Test
+        run: |
+          docker run --rm \
+            -v ${{ github.workspace }}:/work \
+            -w /work \
+            pika-ci \
+            bash -c "./pikatests.sh all clean"
 
   build_on_macos:
 

CMakeLists.txt

@@ -89,6 +89,18 @@ set(INSTALL_LIBDIR ${STAGED_INSTALL_PREFIX}/lib)
 set(INSTALL_LIBDIR_64 ${STAGED_INSTALL_PREFIX}/lib64)
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${STAGED_INSTALL_PREFIX})
 
+# Fix __const__ macro conflict with GCC 13+/glibc 2.38+ in existing brpc headers
+# This must run during CMake configuration to fix cached/existing headers
+if(EXISTS "${INSTALL_INCLUDEDIR}/butil/errno.h")
+  file(READ "${INSTALL_INCLUDEDIR}/butil/errno.h" ERRNO_H_CONTENT)
+  string(FIND "${ERRNO_H_CONTENT}" "#ifndef __const__" HAS_CONST_MACRO)
+  if(NOT HAS_CONST_MACRO EQUAL -1)
+    message(STATUS "Patching existing brpc errno.h for GCC 13+ compatibility")
+    string(REPLACE "#ifndef __const__" "#if 0 /* disabled for GCC 13+ compatibility */" ERRNO_H_CONTENT "${ERRNO_H_CONTENT}")
+    file(WRITE "${INSTALL_INCLUDEDIR}/butil/errno.h" "${ERRNO_H_CONTENT}")
+  endif()
+endif()
+
 execute_process(COMMAND sh ${CMAKE_UTILS_DIR}/Get_OS_Version.sh
   OUTPUT_VARIABLE OS_VERSION)
 
@@ -664,6 +676,12 @@ ExternalProject_Add(brpc
   1
   UPDATE_COMMAND
   ""
+  # Patch to fix __const__ macro conflict with GCC 13+/glibc 2.38+
+  # The issue is that brpc defines __const__ as __unused__ which conflicts with
+  # glibc's __glibc_has_attribute(__const__) macro in sys/cdefs.h
+  # We replace '#ifndef __const__' with '#if 0' to disable the problematic macro
+  PATCH_COMMAND
+  sh -c "sed -i.bak 's/#ifndef __const__/#if 0 /' src/butil/errno.h && cat src/butil/errno.h | head -35"
   LOG_CONFIGURE
   1
   LOG_BUILD
@@ -677,16 +695,29 @@ ExternalProject_Add(brpc
   -DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
   -DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}
   -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+  -DCMAKE_FIND_ROOT_PATH=${STAGED_INSTALL_PREFIX}
+  -DCMAKE_INCLUDE_PATH=${INSTALL_INCLUDEDIR}
+  -DCMAKE_LIBRARY_PATH=${INSTALL_LIBDIR}
   -DWITH_GLOG=ON
   -DWITH_SNAPPY=ON
   -DBUILD_SHARED_LIBS=OFF
   -DDOWNLOAD_GTEST=OFF
+  -DCMAKE_EXE_LINKER_FLAGS=-L${INSTALL_LIBDIR}\ -L${INSTALL_LIBDIR_64}
   BUILD_ALWAYS
   1
   BUILD_COMMAND
   make -j${CPU_CORE}
 )
 
+# Fix the installed header file after brpc installation
+# This is needed because braft uses the installed headers, not the patched source
+# The __const__ macro in butil/errno.h conflicts with glibc 2.38+ / GCC 13+
+ExternalProject_Add_Step(brpc fix_installed_headers
+  COMMAND sh -c "sed -i.bak 's/#ifndef __const__/#if 0 /' ${INSTALL_INCLUDEDIR}/butil/errno.h && cat ${INSTALL_INCLUDEDIR}/butil/errno.h | head -35"
+  DEPENDEES install
+  COMMENT "Patching installed brpc headers for GCC 13+ compatibility"
+)
+
 if(${OS_VERSION} MATCHES "Rocky" OR ${OS_VERSION} MATCHES "CentOS")
   set(BRPC_LIBRARY ${INSTALL_LIBDIR_64}/libbrpc.a)
 else()