Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
cdcdfa1e
M
milvus
项目概览
milvus
/
milvus
10 个月 前同步成功
通知
260
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
cdcdfa1e
编写于
6月 14, 2022
作者:
B
bigsheeper
提交者:
GitHub
6月 14, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Disable jemalloc and use malloc_trim instead (#17538)
Signed-off-by:
N
bigsheeper
<
yihao.dai@zilliz.com
>
上级
47881e7a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
9 addition
and
25 deletion
+9
-25
build/docker/milvus/centos7/Dockerfile
build/docker/milvus/centos7/Dockerfile
+0
-1
build/docker/milvus/ubuntu18.04/Dockerfile
build/docker/milvus/ubuntu18.04/Dockerfile
+0
-1
internal/core/src/segcore/reduce_c.cpp
internal/core/src/segcore/reduce_c.cpp
+6
-0
internal/core/thirdparty/CMakeLists.txt
internal/core/thirdparty/CMakeLists.txt
+3
-3
scripts/start_cluster.sh
scripts/start_cluster.sh
+0
-10
scripts/start_standalone.sh
scripts/start_standalone.sh
+0
-10
未找到文件。
build/docker/milvus/centos7/Dockerfile
浏览文件 @
cdcdfa1e
...
...
@@ -32,7 +32,6 @@ COPY ./lib/ /milvus/lib/
ENV
PATH=/milvus/bin:$PATH
ENV
LD_LIBRARY_PATH=/milvus/lib:$LD_LIBRARY_PATH:/usr/lib
ENV
LD_PRELOAD=/milvus/lib/libjemalloc.so
# Add Tini
ADD
https://github.com/krallin/tini/releases/download/v0.19.0/tini /tini
...
...
build/docker/milvus/ubuntu18.04/Dockerfile
浏览文件 @
cdcdfa1e
...
...
@@ -32,7 +32,6 @@ COPY ./lib/ /milvus/lib/
ENV
PATH=/milvus/bin:$PATH
ENV
LD_LIBRARY_PATH=/milvus/lib:$LD_LIBRARY_PATH:/usr/lib
ENV
LD_PRELOAD=/milvus/lib/libjemalloc.so
# Add Tini
ADD
https://github.com/krallin/tini/releases/download/v0.19.0/tini /tini
...
...
internal/core/src/segcore/reduce_c.cpp
浏览文件 @
cdcdfa1e
...
...
@@ -9,6 +9,9 @@
// is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
// or implied. See the License for the specific language governing permissions and limitations under the License
#ifndef __APPLE__
#include <malloc.h>
#endif
#include <vector>
#include "Reduce.h"
#include "common/CGoHelper.h"
...
...
@@ -83,4 +86,7 @@ DeleteSearchResultDataBlobs(CSearchResultDataBlobs cSearchResultDataBlobs) {
}
auto
search_result_data_blobs
=
reinterpret_cast
<
milvus
::
segcore
::
SearchResultDataBlobs
*>
(
cSearchResultDataBlobs
);
delete
search_result_data_blobs
;
#ifdef __linux__
malloc_trim
(
0
);
#endif
}
internal/core/thirdparty/CMakeLists.txt
浏览文件 @
cdcdfa1e
...
...
@@ -70,6 +70,6 @@ if ( LINUX OR APPLE)
endif
()
# ******************************* Thridparty jemalloc ********************************
if
(
LINUX
)
add_subdirectory
(
jemalloc
)
endif
()
\ No newline at end of file
#if ( LINUX )
# add_subdirectory( jemalloc )
#endif()
\ No newline at end of file
scripts/start_cluster.sh
浏览文件 @
cdcdfa1e
...
...
@@ -16,16 +16,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
if
[[
"
$OSTYPE
"
==
"linux-gnu"
*
]]
;
then
LIBJEMALLOC
=
$PWD
/internal/core/output/lib/libjemalloc.so
if
test
-f
"
$LIBJEMALLOC
"
;
then
#echo "Found $LIBJEMALLOC"
export
LD_PRELOAD
=
"
$LIBJEMALLOC
"
else
echo
"WARN: Cannot find
$LIBJEMALLOC
"
fi
fi
echo
"Starting rootcoord..."
nohup
./bin/milvus run rootcoord
>
/tmp/rootcoord.log 2>&1 &
...
...
scripts/start_standalone.sh
浏览文件 @
cdcdfa1e
...
...
@@ -16,15 +16,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
if
[[
"
$OSTYPE
"
==
"linux-gnu"
*
]]
;
then
LIBJEMALLOC
=
$PWD
/internal/core/output/lib/libjemalloc.so
if
test
-f
"
$LIBJEMALLOC
"
;
then
#echo "Found $LIBJEMALLOC"
export
LD_PRELOAD
=
"
$LIBJEMALLOC
"
else
echo
"WARN: Cannot find
$LIBJEMALLOC
"
fi
fi
echo
"Starting standalone..."
nohup
./bin/milvus run standalone
>
/tmp/standalone.log 2>&1 &
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录