Merge nebd

curvefs_python/BUILD_bak

@@ -41,7 +41,6 @@ cc_library(
     ],
     copts = COPTS,
     linkopts = [
-        "-lbraft",
         "-lcbd",
         "-lcurve_client",
         "-lbrpc",
@@ -54,7 +53,6 @@ cc_library(
         "-lcc_brpc_internal_proto",
         "-lcc_brpc_idl_options_proto",
         "-lleveldb",
-        "-lcc_braft_internal_proto",
         "-lcurve_common",
         "-lcurve_auth",
         "-lcurve_concurrent",
@@ -67,7 +65,6 @@ cc_library(
         "-lprotobuf_lite",
         "-lssl",
         "-lrt",
-        "-lssl",
         "-lcrypto",
         "-ldl",
         "-lz",

curvefs_python/configure.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 echo "********************************************************************"
 echo "***********Prepare for curvefs python API build env.****************"
 echo "********************************************************************"
@@ -15,11 +15,17 @@ cp BUILD_bak BUILD -f
 
 echo "copy libs to tmplib directory"
 
+libs=`cat BUILD | tr -d "[:blank:]" | grep "^\"-l" | sed 's/[",]//g' | awk '{ print substr($0, 3) }'`
 mkdir tmplib
 for i in `find $curve_path/bazel-bin/|grep -w so|grep -v solib|grep -v params`
   do
-    echo $i
-    cp -f $i ./tmplib/
+    basename=$(basename $i)
+    linkname=`echo $basename | awk -F'.' '{ print $1 }' | awk '{ print substr($0, 4) }'`
+    if [[ $libs =~ $linkname ]]
+    then
+        echo $i
+        cp -f $i ./tmplib/
+    fi
   done
 
 echo "Prepare env done, you can build curvefs now."

mk-deb.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 dir=`pwd`
 #step1 清除生成的目录和文件
 bazel clean
@@ -43,13 +43,14 @@ if [ "$1" = "debug" ]
 then
 bazel build ... --copt -DHAVE_ZLIB=1 --compilation_mode=dbg -s --define=with_glog=true \
 --define=libunwind=true --copt -DGFLAGS_NS=google --copt \
--Wno-error=format-security --copt -DUSE_BTHREAD_MUTEX --copt -DCURVEVERSION=${tag_version}
+-Wno-error=format-security --copt -DUSE_BTHREAD_MUTEX --copt -DCURVEVERSION=${tag_version} \
+--linkopt -L${dir}/thirdparties/etcdclient
 if [ $? -ne 0 ]
 then
 	echo "build phase1 failed"
 	exit
 fi
-sh ./curvefs_python/configure.sh
+bash ./curvefs_python/configure.sh
 if [ $? -ne 0 ]
 then
 	echo "configure failed"
@@ -68,13 +69,14 @@ fi
 else
 bazel build ... --copt -DHAVE_ZLIB=1 --copt -O2 -s --define=with_glog=true \
 --define=libunwind=true --copt -DGFLAGS_NS=google --copt \
--Wno-error=format-security --copt -DUSE_BTHREAD_MUTEX --copt -DCURVEVERSION=${tag_version}
+-Wno-error=format-security --copt -DUSE_BTHREAD_MUTEX --copt -DCURVEVERSION=${tag_version} \
+--linkopt -L${dir}/thirdparties/etcdclient
 if [ $? -ne 0 ]
 then
 	echo "build phase1 failed"
 	exit
 fi
-sh ./curvefs_python/configure.sh
+bash ./curvefs_python/configure.sh
 if [ $? -ne 0 ]
 then
 	echo "configure failed"
@@ -303,11 +305,7 @@ if [ $? -ne 0 ]
 then
     exit
 fi
-cp ./bazel-bin/src/tools/nbd/curve-nbd build/curve-sdk/usr/bin/curve-nbd
-if [ $? -ne 0 ]
-then
-	exit
-fi
+
 #cp ./conf/client.conf build/curve-sdk/etc/curve/client.conf
 #if [ $? -ne 0 ]
 #then
@@ -380,6 +378,23 @@ then
 	exit
 fi
 
+# step 3.1 prepare for nebd package
+cp -r nebd/nebd-package build/
+mkdir -p build/nebd-package/usr/bin
+mkdir -p build/nebd-package/usr/lib/nebd
+
+for i in `find bazel-bin/|grep -w so|grep -v solib|grep -v params|grep -v test|grep -v fake`
+do
+    cp -f $i build/nebd-package/usr/lib/nebd
+done
+
+cp bazel-bin/nebd/src/part2/nebd-server build/nebd-package/usr/bin
+
+# step 3.2 prepare for curve-nbd package
+cp -r nbd/nbd-package build
+mkdir -p build/nbd-package/usr/bin
+cp bazel-bin/nbd/src/curve-nbd build/nbd-package/usr/bin
+
 #step4 获取git提交版本信息，记录到debian包的配置文件
 commit_id=`git show --abbrev-commit HEAD|head -n 1|awk '{print $2}'`
 if [ "$1" = "debug" ]
@@ -396,6 +411,8 @@ echo ${version} >> build/curve-tools/DEBIAN/control
 echo ${version} >> build/curve-monitor/DEBIAN/control
 echo ${version} >> build/curve-snapshotcloneserver/DEBIAN/control
 echo ${version} >> build/curve-nginx/DEBIAN/control
+echo ${version} >> build/nebd-package/DEBIAN/control
+echo ${version} >> build/nbd-package/DEBIAN/control
 
 #step5 打包debian包
 dpkg-deb -b build/curve-mds .
@@ -405,6 +422,8 @@ dpkg-deb -b build/curve-tools .
 dpkg-deb -b build/curve-monitor .
 dpkg-deb -b build/curve-snapshotcloneserver .
 dpkg-deb -b build/curve-nginx .
+dpkg-deb -b build/nebd-package .
+dpkg-deb -b build/nbd-package .
 #aws-c-common(commit=0302570a3cbabd98293ee03971e0867f28355086)
 #aws-checksums(commit=78be31b81a2b0445597e60ecb2412bc44e762a99)
 #aws-c-event-stream(commit=ad9a8b2a42d6c6ef07ccf251b5038b89487eacb3)

nbd/nbd-package/DEBIAN/control

@@ -0,0 +1,10 @@
+Package: curve-nbd
+Section:
+Priority: optional
+Depends: libunwind8
+Suggests:
+Architecture: amd64
+Installed-Size:
+Maintainer: curve-dev
+Provides:
+Description: NBD-based client for curve

src/tools/nbd/BUILD → nbd/src/BUILD

@@ -28,35 +28,10 @@ cc_library(
     deps = [
         "//external:gflags",
         "//external:glog",
+        "//nebd/src/part1:nebdclient",
     ],
     copts = COPTS,
     linkopts = [
-        "-L/usr/lib/nebd",
-        "-lnebdclient",
-        "-lclient_proto",
-        "-lnebd_common",
-        "-lbrpc",
-        "-lcc_brpc_idl_options_proto",
-        "-lcc_brpc_internal_proto",
-        "-lbthread",
-        "-lbvar",
-        "-ljson2pb",
-        "-lmcpack2pb",
-        "-lbutil",
-        "-lprotoc_lib",
-        "-lleveldb",
-        "-lprotobuf",
-        "-lprotobuf_lite",
-        "-lssl",
-        "-lrt",
-        "-lssl",
-        "-lcrypto",
-        "-ldl",
-        "-lz",
-        "-lpthread",
-        "-lunwind",
-        "-lstdc++",
-        "-lm",
         "-lnl-3",
         "-lnl-genl-3",
     ],
@@ -70,12 +45,7 @@ cc_binary(
         ]
     ),
     deps = [
-        "//src/tools/nbd:curvenbd"
+        "//nbd/src:curvenbd"
     ],
     copts = COPTS,
-    linkopts = [
-        "-Wl,-rpath=/usr/lib/nebd"
-    ],
 )
-
-

src/tools/nbd/ImageInstance.cpp → nbd/src/ImageInstance.cpp

@@ -5,7 +5,7 @@
  * Copyright (c) 2020 Netease
  */
 
-#include "src/tools/nbd/ImageInstance.h"
+#include "nbd/src/ImageInstance.h"
 #include <glog/logging.h>
 
 namespace curve {

src/tools/nbd/ImageInstance.h → nbd/src/ImageInstance.h

@@ -10,7 +10,7 @@
 
 #include <string>
 #include <memory>
-#include "src/tools/nbd/libnebd.h"
+#include "nebd/src/part1/libnebd.h"
 
 namespace curve {
 namespace nbd {

src/tools/nbd/NBDController.cpp → nbd/src/NBDController.cpp

@@ -5,7 +5,7 @@
  * Copyright (c) 2020 netease
  */
 
-#include "src/tools/nbd/NBDController.h"
+#include "nbd/src/NBDController.h"
 
 namespace curve {
 namespace nbd {

src/tools/nbd/NBDController.h → nbd/src/NBDController.h

@@ -19,9 +19,9 @@
 #include <string>
 #include <memory>
 
-#include "src/tools/nbd/nbd-netlink.h"
-#include "src/tools/nbd/define.h"
-#include "src/tools/nbd/util.h"
+#include "nbd/src/nbd-netlink.h"
+#include "nbd/src/define.h"
+#include "nbd/src/util.h"
 
 namespace curve {
 namespace nbd {

src/tools/nbd/NBDServer.cpp → nbd/src/NBDServer.cpp

@@ -5,14 +5,14 @@
  * Copyright (c) 2020 Netease
  */
 
-#include "src/tools/nbd/NBDServer.h"
+#include "nbd/src/NBDServer.h"
 
 #include <signal.h>
 #include <glog/logging.h>
 #include <inttypes.h>
 #include <netinet/in.h>
 
-#include "src/tools/nbd/util.h"
+#include "nbd/src/util.h"
 
 namespace curve {
 namespace nbd {

src/tools/nbd/NBDServer.h → nbd/src/NBDServer.h

@@ -17,10 +17,10 @@
 #include <string>
 #include <thread>  // NOLINT
 
-#include "src/tools/nbd/ImageInstance.h"
-#include "src/tools/nbd/NBDController.h"
-#include "src/tools/nbd/SafeIO.h"
-#include "src/tools/nbd/libnebd.h"
+#include "nbd/src/ImageInstance.h"
+#include "nbd/src/NBDController.h"
+#include "nbd/src/SafeIO.h"
+#include "nebd/src/part1/libnebd.h"
 
 namespace curve {
 namespace nbd {

src/tools/nbd/NBDTool.cpp → nbd/src/NBDTool.cpp

@@ -9,9 +9,9 @@
 #include <limits.h>
 #include <memory>
 #include <string>
-#include "src/tools/nbd/NBDTool.h"
-#include "src/tools/nbd/argparse.h"
-#include "src/tools/nbd/texttable.h"
+#include "nbd/src/NBDTool.h"
+#include "nbd/src/argparse.h"
+#include "nbd/src/texttable.h"
 
 namespace curve {
 namespace nbd {

src/tools/nbd/NBDTool.h → nbd/src/NBDTool.h

@@ -11,11 +11,11 @@
 #include <vector>
 #include <string>
 #include <memory>
-#include "src/tools/nbd/define.h"
-#include "src/tools/nbd/NBDController.h"
-#include "src/tools/nbd/NBDServer.h"
-#include "src/tools/nbd/ImageInstance.h"
-#include "src/tools/nbd/NBDWatchContext.h"
+#include "nbd/src/define.h"
+#include "nbd/src/NBDController.h"
+#include "nbd/src/NBDServer.h"
+#include "nbd/src/ImageInstance.h"
+#include "nbd/src/NBDWatchContext.h"
 
 namespace curve {
 namespace nbd {

src/tools/nbd/NBDWatchContext.cpp → nbd/src/NBDWatchContext.cpp

@@ -5,7 +5,7 @@
  * Copyright (c) 2020 NetEase
  */
 
-#include "src/tools/nbd/NBDWatchContext.h"
+#include "nbd/src/NBDWatchContext.h"
 #include <glog/logging.h>
 
 namespace curve {

src/tools/nbd/NBDWatchContext.h → nbd/src/NBDWatchContext.h

@@ -11,9 +11,9 @@
 #include <atomic>
 #include <thread>  // NOLINT
 #include <memory>
-#include "src/tools/nbd/ImageInstance.h"
-#include "src/tools/nbd/NBDController.h"
-#include "src/tools/nbd/interruptible_sleeper.h"
+#include "nbd/src/ImageInstance.h"
+#include "nbd/src/NBDController.h"
+#include "src/common/interruptible_sleeper.h"
 
 namespace curve {
 namespace nbd {
@@ -62,7 +62,7 @@ class NBDWatchContext {
     // 任务线程
     std::thread watchThread_;
 
-    InterruptibleSleeper sleeper_;
+    curve::common::InterruptibleSleeper sleeper_;
 };
 
 }  // namespace nbd

src/tools/nbd/SafeIO.cpp → nbd/src/SafeIO.cpp

@@ -5,10 +5,10 @@
  * Copyright (c) 2020 Netease
  */
 
-#include "src/tools/nbd/SafeIO.h"
+#include "nbd/src/SafeIO.h"
 #include <cerrno>
 
-#include "src/tools/nbd/util.h"
+#include "nbd/src/util.h"
 
 namespace curve {
 namespace nbd {

src/tools/nbd/argparse.cpp → nbd/src/argparse.cpp

@@ -13,7 +13,7 @@
 #include <sstream>
 #include <iostream>
 
-#include "src/tools/nbd/argparse.h"
+#include "nbd/src/argparse.h"
 
 namespace curve {
 namespace nbd {

src/tools/nbd/main.cpp → nbd/src/main.cpp

@@ -11,14 +11,14 @@
 #include <iostream>
 #include <string>
 
-#include "src/tools/nbd/ImageInstance.h"
-#include "src/tools/nbd/NBDController.h"
-#include "src/tools/nbd/NBDServer.h"
-#include "src/tools/nbd/NBDTool.h"
-#include "src/tools/nbd/NBDWatchContext.h"
-#include "src/tools/nbd/argparse.h"
-#include "src/tools/nbd/define.h"
-#include "src/tools/nbd/util.h"
+#include "nbd/src/ImageInstance.h"
+#include "nbd/src/NBDController.h"
+#include "nbd/src/NBDServer.h"
+#include "nbd/src/NBDTool.h"
+#include "nbd/src/NBDWatchContext.h"
+#include "nbd/src/argparse.h"
+#include "nbd/src/define.h"
+#include "nbd/src/util.h"
 
 namespace curve {
 namespace nbd {

src/tools/nbd/texttable.cpp → nbd/src/texttable.cpp

@@ -11,7 +11,7 @@
  * Foundation.  See file COPYING.
  *
  */
-#include "src/tools/nbd/texttable.h"
+#include "nbd/src/texttable.h"
 
 namespace curve {
 namespace nbd {