From ba2d0839706f8fa678fa80f810c71205f12a223a Mon Sep 17 00:00:00 2001 From: Tao He Date: Wed, 1 Feb 2023 10:23:25 +0800 Subject: [PATCH] Bump up vineyard version to v0.12.2 Fixes a bug introduced in https://github.com/v6d-io/v6d/commit/7c09843102081e9c1c9fabd945f493195c31752b Signed-off-by: Tao He --- .github/workflows/build-vineyardd-and-wheels-linux.yaml | 4 ++-- CMakeLists.txt | 2 +- charts/vineyard-operator/Chart.yaml | 4 ++-- setup.cfg | 2 +- src/common/util/config.h | 4 ++-- src/server/async/socket_server.cc | 3 ++- test/remote_buffer_test.cc | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-vineyardd-and-wheels-linux.yaml b/.github/workflows/build-vineyardd-and-wheels-linux.yaml index 572016d7..7286f614 100644 --- a/.github/workflows/build-vineyardd-and-wheels-linux.yaml +++ b/.github/workflows/build-vineyardd-and-wheels-linux.yaml @@ -154,9 +154,9 @@ jobs: run: | if [[ "${{ matrix.python }}" == "cp311-cp311" ]]; then - export base=vineyard-manylinux2014:20230115 + export base=manylinux2014:20230115 else - export base=vineyard-manylinux1:20220512 + export base=manylinux1:20220512 fi sudo docker build . -f docker/pypa/Dockerfile.manylinux1-wheel \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 034cf5ea..84eafb23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3) set(VINEYARD_MAJOR_VERSION 0) set(VINEYARD_MINOR_VERSION 12) -set(VINEYARD_PATCH_VERSION 1) +set(VINEYARD_PATCH_VERSION 2) set(VINEYARD_VERSION ${VINEYARD_MAJOR_VERSION}.${VINEYARD_MINOR_VERSION}.${VINEYARD_PATCH_VERSION}) message(STATUS "Configuring and building vineyard version '${VINEYARD_VERSION}'.") diff --git a/charts/vineyard-operator/Chart.yaml b/charts/vineyard-operator/Chart.yaml index a4cbefc6..000f9775 100644 --- a/charts/vineyard-operator/Chart.yaml +++ b/charts/vineyard-operator/Chart.yaml @@ -24,10 +24,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.12.1 +version: 0.12.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.12.1 +appVersion: 0.12.2 diff --git a/setup.cfg b/setup.cfg index 90ddc5d9..df87f9fe 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -version = 0.12.1 +version = 0.12.2 [pycodestyle] max_line_length = 88 diff --git a/src/common/util/config.h b/src/common/util/config.h index c818b4aa..e4a291d7 100644 --- a/src/common/util/config.h +++ b/src/common/util/config.h @@ -18,11 +18,11 @@ limitations under the License. #define VINEYARD_VERSION_MAJOR 0 #define VINEYARD_VERSION_MINOR 12 -#define VINEYARD_VERSION_PATCH 1 +#define VINEYARD_VERSION_PATCH 2 #define VINEYARD_VERSION \ ((VINEYARD_VERSION_MAJOR * 1000) + VINEYARD_VERSION_MINOR) * 1000 + \ VINEYARD_VERSION_PATCH -#define VINEYARD_VERSION_STRING "0.12.1" +#define VINEYARD_VERSION_STRING "0.12.2" #endif // SRC_COMMON_UTIL_CONFIG_H_ diff --git a/src/server/async/socket_server.cc b/src/server/async/socket_server.cc index 36382b7f..331ca147 100644 --- a/src/server/async/socket_server.cc +++ b/src/server/async/socket_server.cc @@ -50,6 +50,8 @@ SocketConnection::SocketConnection( if (plasma_bulk_store != nullptr) { plasma_bulk_store_ = plasma_bulk_store->shared_from_this(); } + // initializing + this->registered_.store(false); } bool SocketConnection::Start() { @@ -446,7 +448,6 @@ bool SocketConnection::doGetRemoteBuffers(const json& root) { bool compress = false; std::vector> objects; std::string message_out; - this->registered_.store(false); TRY_READ_REQUEST(ReadGetRemoteBuffersRequest, root, ids, unsafe, compress); RESPONSE_ON_ERROR(bulk_store_->GetUnsafe(ids, unsafe, objects)); diff --git a/test/remote_buffer_test.cc b/test/remote_buffer_test.cc index 8ea00358..a4cdfbf0 100644 --- a/test/remote_buffer_test.cc +++ b/test/remote_buffer_test.cc @@ -57,7 +57,7 @@ void RemoteCreateTest(Client& ipc_client, RPCClient& rpc_client) { CHECK_EQ(local_buffer->data()[index], array_data[index]); } - LOG(INFO) << "Passed remote buffer (local create & remote get) tests..."; + LOG(INFO) << "Passed remote buffer (remote create & local get) tests..."; } void RemoteGetTest(Client& ipc_client, RPCClient& rpc_client) {