diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml index 06b123778..c1c9054a6 100644 --- a/.github/workflows/build_dependencies.yml +++ b/.github/workflows/build_dependencies.yml @@ -165,10 +165,10 @@ jobs: run: | pre=$([[ "${{ inputs.build-type }}" != "Debug" ]] && echo "-o sisl:prerelease=${{ inputs.prerelease }}" || echo "") conan install \ + -c tools.build:skip_test=True \ ${pre} \ -o sisl:malloc_impl=${{ inputs.malloc-impl }} \ -o iomgr:testing=off \ - -o nuraft_mesg:testing=False \ -o testing=off \ -s build_type=${{ inputs.build-type }} \ --build missing \ @@ -211,10 +211,10 @@ jobs: sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False") pre=$([[ "${{ inputs.build-type }}" != "Debug" ]] && echo "-o sisl:prerelease=${{ inputs.prerelease }}" || echo "") conan create \ + -c tools.build:skip_test=True \ ${pre} \ -o sisl:malloc_impl=${{ inputs.malloc-impl }} \ -o iomgr:testing=off \ - -o nuraft_mesg:testing=False \ -o homestore:sanitize=${sanitize} \ -s build_type=${{ inputs.build-type }} \ --build missing \ @@ -225,10 +225,10 @@ jobs: run: | pre=$([[ "${{ inputs.build-type }}" != "Debug" ]] && echo "-o sisl:prerelease=${{ inputs.prerelease }}" || echo "") conan install \ + -c tools.build:skip_test=True \ ${pre} \ -o sisl:malloc_impl=${{ inputs.malloc-impl }} \ -o iomgr:testing=off \ - -o nuraft_mesg:testing=False \ -o coverage=True \ -s build_type=${{ inputs.build-type }} \ --build missing \ diff --git a/conanfile.py b/conanfile.py index 38bb6fb8d..69cf3a1e9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -5,7 +5,7 @@ class HomestoreConan(ConanFile): name = "homestore" - version = "5.1.4" + version = "5.1.5" homepage = "https://github.com/eBay/Homestore" description = "HomeStore Storage Engine" @@ -57,7 +57,7 @@ def build_requirements(self): def requirements(self): self.requires("iomgr/[~=11, include_prerelease=True]@oss/master") self.requires("sisl/[~=11, include_prerelease=True]@oss/master") - self.requires("nuraft_mesg/[~=2, include_prerelease=True]@oss/main") + self.requires("nuraft_mesg/[~=3, include_prerelease=True]@oss/main") self.requires("farmhash/cci.20190513@") if self.settings.arch in ['x86', 'x86_64']: diff --git a/src/lib/replication/repl_dev/raft_repl_dev.cpp b/src/lib/replication/repl_dev/raft_repl_dev.cpp index 91b85ca4d..b7cc53b4f 100644 --- a/src/lib/replication/repl_dev/raft_repl_dev.cpp +++ b/src/lib/replication/repl_dev/raft_repl_dev.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -450,8 +451,8 @@ void RaftReplDev::fetch_data_from_remote(std::vector< repl_req_ptr_t >* rreqs) { .thenValue([this, builder, rreqs](auto e) { RD_REL_ASSERT(!!e, "Error in fetching data"); - auto raw_data = e.value().cbytes(); - auto total_size = e.value().size(); + auto raw_data = e.value().response_blob().cbytes(); + auto total_size = e.value().response_blob().size(); for (auto const& rreq : *rreqs) { auto const data_size = rreq->remote_blkid.blkid.blk_count() * get_blk_size();