Skip to content

Commit

Permalink
[fix]make tgtd to curvebs image
Browse files Browse the repository at this point in the history
1. add tgtd to image
2. add modprobe

Signed-off-by: Cyber-SiKu <Cyber-SiKu@outlook.com>
  • Loading branch information
Cyber-SiKu committed Apr 10, 2023
1 parent 15e6952 commit 5e89a86
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 4 deletions.
2 changes: 1 addition & 1 deletion curvefs/docker/debian9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ COPY curvefs /curvefs
COPY libmemcached.so libmemcached.so.11 libhashkit.so.2 /usr/lib/
RUN mkdir -p /etc/curvefs /core /etc/curve && chmod a+x /entrypoint.sh \
&& cp /curvefs/tools/sbin/curvefs_tool /usr/bin \
&& cp curvefs/tools-v2/sbin/curve /usr/bin/
&& cp /curvefs/tools-v2/sbin/curve /usr/bin/
ENTRYPOINT ["/entrypoint.sh"]
20 changes: 17 additions & 3 deletions docker/debian9/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
FROM opencurvedocker/curve-base:debian9
COPY --from=opencurvedocker/curve-base:curve-tgt-debian9 /curve-tgt/ /curve-tgt/
COPY --from=opencurvedocker/curve-base:curve-tgt-debian9 /curve/curve-sdk /curve-tgt/curve-sdk
RUN apt update \
&& apt install -y kmod \
&& cd /curve-tgt/curve-sdk \
&& cp -f lib/* /usr/lib \
&& cp -f bin/* /usr/bin \
&& mkdir -p /usr/curvefs \
&& cp -f curvefs/* /usr/curvefs \
&& cp -f include/* /usr/include \
&& ldconfig \
&& cd /curve-tgt/ \
&& make install-programs \
&& rm -rf /curve-tgt
COPY entrypoint.sh /
COPY curvebs /curvebs
RUN mkdir -p /etc/curve /etc/nebd /curve/init.d/ \
&& chmod a+x /entrypoint.sh \
&& cp curvebs/nbd/sbin/curve-nbd /usr/bin/ \
&& cp curvebs/tools/sbin/curve_ops_tool /usr/bin/ \
&& cp curvebs/tools-v2/sbin/curve /usr/bin/
&& cp /curvebs/nbd/sbin/curve-nbd /usr/bin/ \
&& cp /curvebs/tools/sbin/curve_ops_tool /usr/bin/ \
&& cp /curvebs/tools-v2/sbin/curve /usr/bin/
ENTRYPOINT ["/entrypoint.sh"]
1 change: 1 addition & 0 deletions docker/debian9/compile/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ RUN echo "deb http://mirrors.163.com/debian/ stretch main\n" \
gdb \
unzip \
musl-tools \
libunwind8-dev \
&& mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
Expand Down
31 changes: 31 additions & 0 deletions docker/debian9/curve-tgt/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM opencurvedocker/curve-base:build-debian9 AS curve-sdk
ENV GITHUB_PROXY=https://ghproxy.com/
RUN git clone ${GITHUB_PROXY}https://github.com/opencurve/curve \
&& cd /curve \
&& bash replace-curve-repo.sh \
&& make dep stor=fs \
&& bash mk-tar.sh \
&& mv curve_*.tar.gz curve_sdk.tar.gz

FROM opencurvedocker/curve-base:build-debian9 AS curve-tgt
ENV GITHUB_PROXY=https://ghproxy.com/
COPY --from=curve-sdk /curve/curve_sdk.tar.gz /
RUN tar -zxvf curve_sdk.tar.gz \
&& rm curve_sdk.tar.gz \
&& cd /curve/curve-sdk \
&& cp -f lib/* /usr/lib \
&& cp -f bin/* /usr/bin \
&& mkdir -p /usr/curvefs \
&& cp -f curvefs/* /usr/curvefs \
&& cp -f include/* /usr/include \
&& ldconfig \
&& apt update \
&& apt install -y devscripts \
librdmacm-dev \
libibverbs-dev \
xsltproc \
docbook-xsl \
&& cd / \
&& git clone --branch curve ${GITHUB_PROXY}https://github.com/opencurve/curve-tgt \
&& cd curve-tgt \
&& make programs
4 changes: 4 additions & 0 deletions docker/debian9/curve-tgt/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.PHONY: build

build:
docker build --target curve-tgt -t opencurvedocker/curve-base:curve-tgt-debian9 .
5 changes: 5 additions & 0 deletions nebd/src/part2/file_entity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,11 @@ int NebdFileEntity::UpdateFileStatus(NebdFileInstancePtr fileInstance) {
fileInstance_ = fileInstance;
status_ = NebdFileStatus::OPENED;
timeStamp_ = TimeUtility::GetTimeofDayMs();
OpenFlags flags;
if (fileInstance->xattr.count(kOpenFlagsAttrKey) &&
flags.ParseFromString(fileInstance->xattr.at(kOpenFlagsAttrKey))) {
openFlags_.reset(new OpenFlags{flags});
}
return 0;
}

Expand Down

0 comments on commit 5e89a86

Please sign in to comment.