From 9c51f03b2f48af2f204187e6165e3903dfe403cc Mon Sep 17 00:00:00 2001 From: "debing.sun" Date: Wed, 15 May 2024 14:12:22 +0800 Subject: [PATCH] Revert "Change mmap rand bits as a temporary mitigation to resolve asan bug (#13150)" (#13266) The kernel config `vm.mmap_rnd_bits` had been revert in https://github.com/actions/runner-images/issues/9491, so we can revert the changes from #13150. CI only with ASAN passed: https://github.com/sundb/redis/actions/runs/9058263634 --- .github/workflows/ci.yml | 5 +---- .github/workflows/daily.yml | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 449ec574951..3778d032623 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,10 +33,7 @@ jobs: # build with TLS module just for compilation coverage run: make SANITIZER=address REDIS_CFLAGS='-Werror -DDEBUG_ASSERTIONS' BUILD_TLS=module - name: testprep - # Work around ASAN issue, see https://github.com/google/sanitizers/issues/1716 - run: | - sudo apt-get install tcl8.6 tclx -y - sudo sysctl vm.mmap_rnd_bits=28 + run: sudo apt-get install tcl8.6 tclx -y - name: test run: ./runtest --verbose --tags -slow --dump-logs - name: module api test diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index cff4061838f..8e382ec80a3 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -589,11 +589,9 @@ jobs: - name: make run: make SANITIZER=address REDIS_CFLAGS='-DREDIS_TEST -Werror -DDEBUG_ASSERTIONS' - name: testprep - # Work around ASAN issue, see https://github.com/google/sanitizers/issues/1716 run: | sudo apt-get update sudo apt-get install tcl8.6 tclx -y - sudo sysctl vm.mmap_rnd_bits=28 - name: test if: true && !contains(github.event.inputs.skiptests, 'redis') run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}