diff --git a/milvus_binary/env.sh b/milvus_binary/env.sh index b1884ac..8df7035 100644 --- a/milvus_binary/env.sh +++ b/milvus_binary/env.sh @@ -1,5 +1,5 @@ MILVUS_REPO="https://github.com/milvus-io/milvus.git" -MILVUS_VERSION="v2.3.2" +MILVUS_VERSION="v2.3.3" BUILD_PROXY= BUILD_FORCE=NO diff --git a/milvus_binary/patches/knowhere-v2.2.2.patch b/milvus_binary/patches/knowhere-v2.2.2.patch new file mode 100644 index 0000000..994857e --- /dev/null +++ b/milvus_binary/patches/knowhere-v2.2.2.patch @@ -0,0 +1,34 @@ +From 787a20b6340b987a2e082ebafe4c53d2c3624f6a Mon Sep 17 00:00:00 2001 +From: Ji Bin +Date: Sun, 5 Nov 2023 18:27:32 +0800 +Subject: [PATCH] fix for gettid + +Signed-off-by: Ji Bin +--- + include/knowhere/comp/thread_pool.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/knowhere/comp/thread_pool.h b/include/knowhere/comp/thread_pool.h +index a00920d..60546f5 100644 +--- a/include/knowhere/comp/thread_pool.h ++++ b/include/knowhere/comp/thread_pool.h +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + #include + #include +@@ -35,7 +36,7 @@ class ThreadPool { + std::thread + newThread(folly::Func&& func) override { + return folly::NamedThreadFactory::newThread([&, func = std::move(func)]() mutable { +- if (setpriority(PRIO_PROCESS, gettid(), 19) != 0) { ++ if (setpriority(PRIO_PROCESS, syscall(SYS_gettid), 19) != 0) { + LOG_KNOWHERE_ERROR_ << "Failed to set priority of knowhere thread. Error is: " + << std::strerror(errno); + } else { +-- +2.42.1 + diff --git a/milvus_binary/patches/milvus-v2.3.3/0001-link-with-CoreServices-for-macos.patch b/milvus_binary/patches/milvus-v2.3.3/0001-link-with-CoreServices-for-macos.patch new file mode 100644 index 0000000..ee3826c --- /dev/null +++ b/milvus_binary/patches/milvus-v2.3.3/0001-link-with-CoreServices-for-macos.patch @@ -0,0 +1,29 @@ +From 97cec70e523aaa0fba0879efb39bb5dea341c51e Mon Sep 17 00:00:00 2001 +From: Ji Bin +Date: Mon, 13 Nov 2023 23:20:16 +0800 +Subject: [PATCH 1/2] link with CoreServices for macos + +Signed-off-by: Ji Bin +--- + internal/core/src/storage/azure-blob-storage/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/internal/core/src/storage/azure-blob-storage/CMakeLists.txt b/internal/core/src/storage/azure-blob-storage/CMakeLists.txt +index 7f27d5838..bde7f4457 100644 +--- a/internal/core/src/storage/azure-blob-storage/CMakeLists.txt ++++ b/internal/core/src/storage/azure-blob-storage/CMakeLists.txt +@@ -25,6 +25,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter -Wno-return-type - + add_library(blob-chunk-manager SHARED AzureBlobChunkManager.cpp) + target_link_libraries(blob-chunk-manager PUBLIC Azure::azure-identity Azure::azure-storage-blobs) + ++if (APPLE) ++ find_library(CORESERVICES_LIBRARY CoreServices) ++ target_link_libraries(blob-chunk-manager PRIVATE ${CORESERVICES_LIBRARY}) ++endif (APPLE) ++ + install(TARGETS blob-chunk-manager DESTINATION "${CMAKE_INSTALL_LIBDIR}") + + if ( BUILD_UNIT_TEST STREQUAL "ON" ) +-- +2.42.1 + diff --git a/milvus_binary/patches/milvus-v2.3.3/0002-fix-for-gettid.patch b/milvus_binary/patches/milvus-v2.3.3/0002-fix-for-gettid.patch new file mode 100644 index 0000000..7776ebc --- /dev/null +++ b/milvus_binary/patches/milvus-v2.3.3/0002-fix-for-gettid.patch @@ -0,0 +1,25 @@ +From f69d9de4166844e27fb086290e84d909c5288d0a Mon Sep 17 00:00:00 2001 +From: Ji Bin +Date: Sun, 5 Nov 2023 18:49:29 +0800 +Subject: [PATCH 2/2] fix for gettid + +Signed-off-by: Ji Bin +--- + internal/core/thirdparty/knowhere/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/internal/core/thirdparty/knowhere/CMakeLists.txt b/internal/core/thirdparty/knowhere/CMakeLists.txt +index d8bb751ce..3b173e4eb 100644 +--- a/internal/core/thirdparty/knowhere/CMakeLists.txt ++++ b/internal/core/thirdparty/knowhere/CMakeLists.txt +@@ -41,6 +41,7 @@ FetchContent_Declare( + GIT_TAG ${KNOWHERE_VERSION} + SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/knowhere-src + BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/knowhere-build ++ PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/../../../patches/knowhere-v2.2.2.patch + DOWNLOAD_DIR ${THIRDPARTY_DOWNLOAD_PATH} ) + + FetchContent_GetProperties( knowhere ) +-- +2.42.1 + diff --git a/src/milvus/__init__.py b/src/milvus/__init__.py index aafd98b..4174847 100644 --- a/src/milvus/__init__.py +++ b/src/milvus/__init__.py @@ -21,7 +21,7 @@ import json import hashlib -__version__ = '2.3.2' +__version__ = '2.3.3' LOGGERS = {} diff --git a/src/milvus/data/config.yaml.template b/src/milvus/data/config.yaml.template index add8e56..ea0ad52 100644 --- a/src/milvus/data/config.yaml.template +++ b/src/milvus/data/config.yaml.template @@ -87,15 +87,15 @@ minio: # Custom endpoint for fetch IAM role credentials. when useIAM is true & cloudProvider is "aws". # Leave it empty if you want to use AWS default endpoint iamEndpoint: - # Log level for aws sdk log. + # Log level for aws sdk log. # Supported level: off, fatal, error, warn, info, debug, trace - logLevel: error + logLevel: fatal # Cloud data center region region: "" # Cloud whether use virtual host bucket mode useVirtualHost: false # timeout for request time in milliseconds - requestTimeoutMs: 3000 + requestTimeoutMs: 10000 # Milvus supports four MQ: rocksmq(based on RockDB), natsmq(embedded nats-server), Pulsar and Kafka. # You can change your mq by setting mq.type field. @@ -221,7 +221,7 @@ proxy: # Related configuration of queryCoord, used to manage topology and load balancing for the query nodes, and handoff from growing segments to sealed segments. queryCoord: autoHandoff: true # Enable auto handoff - autoBalance: true # Enable auto balance + autoBalance: false # Enable auto balance balancer: ScoreBasedBalancer # Balancer to use globalRowCountFactor: 0.1 # expert parameters, only used by scoreBasedBalancer scoreUnbalanceTolerationFactor: 0.05 # expert parameters, only used by scoreBasedBalancer @@ -512,7 +512,7 @@ common: # superUsers: root tlsMode: {{ tls_mode(int): 0 }} session: - ttl: 60 # ttl value when session granting a lease to register service + ttl: 30 # ttl value when session granting a lease to register service retryTimes: 30 # retry times when session sending etcd requests # preCreatedTopic decides whether using existed topic