diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d158092c8..849aff902 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -210,7 +210,9 @@ jobs: dfly-executable: dragonfly run-only-on-ubuntu-latest: true build-folder-name: build - filter: ${{ matrix.build-type == 'Release' && '(not slow) and (not dbg_only)' || '(not slow) and (not opt_only)' }} + # Non-release build will not run tests marked as slow or opt_only + # "not empty" string is needed for release build because pytest command can not get empty string for filter + filter: ${{ matrix.build-type == 'Release' && 'not empty' || '(not slow) and (not opt_only)' }} - name: Upload regression logs on failure if: failure() diff --git a/.github/workflows/epoll-regression-tests.yml b/.github/workflows/epoll-regression-tests.yml index b54c07d40..6a1e97364 100644 --- a/.github/workflows/epoll-regression-tests.yml +++ b/.github/workflows/epoll-regression-tests.yml @@ -51,7 +51,7 @@ jobs: dfly-executable: dragonfly gspace-secret: ${{ secrets.GSPACES_BOT_DF_BUILD }} build-folder-name: build - filter: ${{ matrix.build-type == 'Release' && 'not dbg_only' || 'not opt_only' }} + filter: ${{ matrix.build-type == 'Release' && 'not empty' || 'not opt_only' }} aws-access-key-id: ${{ secrets.AWS_S3_ACCESS_KEY }} aws-secret-access-key: ${{ secrets.AWS_S3_ACCESS_SECRET }} s3-bucket: ${{ secrets.S3_REGTEST_BUCKET }} diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml index 3c35b605c..6d2b86a45 100644 --- a/.github/workflows/regression-tests.yml +++ b/.github/workflows/regression-tests.yml @@ -51,7 +51,7 @@ jobs: dfly-executable: dragonfly gspace-secret: ${{ secrets.GSPACES_BOT_DF_BUILD }} build-folder-name: build - filter: ${{ matrix.build-type == 'Release' && 'not dbg_only' || 'not opt_only' }} + filter: ${{ matrix.build-type == 'Release' && 'not empty' || 'not opt_only' }} aws-access-key-id: ${{ secrets.AWS_S3_ACCESS_KEY }} aws-secret-access-key: ${{ secrets.AWS_S3_ACCESS_SECRET }} s3-bucket: ${{ secrets.S3_REGTEST_BUCKET }} diff --git a/src/server/replica.cc b/src/server/replica.cc index 7b34deab8..608685d18 100644 --- a/src/server/replica.cc +++ b/src/server/replica.cc @@ -93,7 +93,7 @@ GenericError Replica::Start() { auto check_connection_error = [this](error_code ec, const char* msg) -> GenericError { if (!cntx_.IsRunning()) { - return {std::make_error_code(errc::operation_canceled), "replication cancelled"}; + return {"replication cancelled"}; } if (ec) { cntx_.ReportCancelError();