Skip to content

Commit

Permalink
enhance: make milvus image with asan available (milvus-io#37050)
Browse files Browse the repository at this point in the history
issue: milvus-io#35854

Signed-off-by: chyezh <[email protected]>
  • Loading branch information
chyezh authored Oct 24, 2024
1 parent 49b5622 commit f07aa72
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ ifdef disk_index
endif

use_asan = OFF
ifdef USE_ASAN
use_asan =${USE_ASAN}
ifeq ($(USE_ASAN), ON)
use_asan = ${USE_ASAN}
CGO_LDFLAGS := $(shell go env CGO_LDFLAGS) -fno-stack-protector -fno-omit-frame-pointer -fno-var-tracking -fsanitize=address
CGO_CFLAGS := $(shell go env CGO_CFLAGS) -fno-stack-protector -fno-omit-frame-pointer -fno-var-tracking -fsanitize=address
MILVUS_GO_BUILD_TAGS := $(MILVUS_GO_BUILD_TAGS),use_asan
Expand Down Expand Up @@ -384,12 +384,12 @@ codecov-cpp: build-cpp-with-coverage
# Build each component and install binary to $GOPATH/bin.
install: milvus
@echo "Installing binary to './bin'"
@(env USE_ASAN=$(USE_ASAN) GOPATH=$(GOPATH) LIBRARY_PATH=$(LIBRARY_PATH) bash $(PWD)/scripts/install_milvus.sh)
@(env GOPATH=$(GOPATH) LIBRARY_PATH=$(LIBRARY_PATH) bash $(PWD)/scripts/install_milvus.sh)
@echo "Installation successful."

gpu-install: milvus-gpu
@echo "Installing binary to './bin'"
@(env USE_ASAN=$(USE_ASAN) GOPATH=$(GOPATH) LIBRARY_PATH=$(LIBRARY_PATH) bash $(PWD)/scripts/install_milvus.sh)
@(env GOPATH=$(GOPATH) LIBRARY_PATH=$(LIBRARY_PATH) bash $(PWD)/scripts/install_milvus.sh)
@echo "Installation successful."

clean:
Expand Down
3 changes: 2 additions & 1 deletion build/docker/milvus/amazonlinux2023/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
FROM amazonlinux:2023

ARG TARGETARCH
ARG MILVUS_ASAN_LIB

RUN yum install -y wget libgomp libaio libatomic openblas-devel && \
rm -rf /var/cache/yum/*
Expand All @@ -29,7 +30,7 @@ COPY --chown=root:root --chmod=774 ./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
ENV LD_PRELOAD=${MILVUS_ASAN_LIB}:/milvus/lib/libjemalloc.so
ENV MALLOC_CONF=background_thread:true

ENTRYPOINT ["/tini", "--"]
Expand Down
3 changes: 2 additions & 1 deletion build/docker/milvus/rockylinux8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
FROM rockylinux/rockylinux:8

ARG TARGETARCH
ARG MILVUS_ASAN_LIB

RUN dnf install -y wget libgomp libaio libatomic

Expand All @@ -33,7 +34,7 @@ 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
ENV LD_PRELOAD=${MILVUS_ASAN_LIB}:/milvus/lib/libjemalloc.so
ENV MALLOC_CONF=background_thread:true

ENTRYPOINT ["/tini", "--"]
Expand Down
3 changes: 2 additions & 1 deletion build/docker/milvus/ubuntu20.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
FROM ubuntu:focal-20240530

ARG TARGETARCH
ARG MILVUS_ASAN_LIB

RUN apt-get update && \
apt-get install -y --no-install-recommends curl ca-certificates libaio-dev libgomp1 libopenblas-dev && \
Expand All @@ -30,7 +31,7 @@ COPY --chown=root:root --chmod=774 ./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
ENV LD_PRELOAD=${MILVUS_ASAN_LIB}:/milvus/lib/libjemalloc.so
ENV MALLOC_CONF=background_thread:true

ENTRYPOINT ["/tini", "--"]
Expand Down
3 changes: 2 additions & 1 deletion build/docker/milvus/ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
FROM ubuntu:jammy-20240530

ARG TARGETARCH
ARG MILVUS_ASAN_LIB

RUN apt-get update && \
apt-get install -y --no-install-recommends curl ca-certificates libaio-dev libgomp1 libopenblas-dev && \
Expand All @@ -30,7 +31,7 @@ COPY --chown=root:root --chmod=774 ./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
ENV LD_PRELOAD=${MILVUS_ASAN_LIB}:/milvus/lib/libjemalloc.so
ENV MALLOC_CONF=background_thread:true

ENTRYPOINT ["/tini", "--"]
Expand Down

0 comments on commit f07aa72

Please sign in to comment.