fix aws and etcdclient dependency

Change-Id: I6480a99a731e6b554f8d36ad3b6c469844187070
ChenBoEason · Jul 13, 2020 · 6c34087 · 6c34087
1 parent 7256b5d
commit 6c34087
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 18 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -133,3 +133,15 @@ bind(
     name = "json",
     actual = "@jsoncpp//:json",
 )
+
+new_local_repository(
+    name = "aws_sdk",
+    build_file = "bazel/aws-sdk.BUILD",
+    path = "thirdparties/aws-sdk/usr",
+)
+
+new_local_repository(
+    name = "etcdclient",
+    build_file = "bazel/etcdclient.BUILD",
+    path = "thirdparties/etcdclient",
+)
diff --git a/bazel/aws-sdk.BUILD b/bazel/aws-sdk.BUILD
@@ -0,0 +1,15 @@
+cc_library(
+    name = "aws_sdk",
+    srcs = glob([
+        "lib/lib*so",
+    ]),
+    hdrs = glob([
+        "include/**/*.*",
+    ]),
+    includes = [
+        "include",
+    ],
+    visibility = [
+        "//visibility:public"
+    ],
+)
diff --git a/bazel/etcdclient.BUILD b/bazel/etcdclient.BUILD
@@ -0,0 +1,15 @@
+cc_library(
+    name = "etcdclient",
+    srcs = glob([
+        "libetcdclient.so",
+    ]),
+    hdrs = glob([
+        "libetcdclient.h",
+    ]),
+    includes = [
+        "."
+    ],
+    visibility = [
+        "//visibility:public"
+    ],
+)
diff --git a/include/etcdclient/BUILD b/include/etcdclient/BUILD
@@ -21,4 +21,4 @@ cc_library(
         "-letcdclient",
     ]),
     visibility = ["//visibility:public"],
-)
+)
diff --git a/src/common/BUILD b/src/common/BUILD
@@ -84,14 +84,10 @@ cc_library(
         "s3_adapter.cpp",
     ]),
     copts = COPTS,
-    linkopts = [
-        "-laws-cpp-sdk-s3",
-        "-laws-cpp-sdk-core",
-        "-L/usr/local/lib"
-    ],
     visibility = ["//visibility:public"],
     deps = [
         "//external:glog",
         "//src/common:curve_common",
+        "@aws_sdk//:aws_sdk",
     ],
 )
diff --git a/src/common/s3_adapter.h b/src/common/s3_adapter.h
@@ -48,7 +48,7 @@
 #include <aws/core/utils/memory/stl/AWSStringStream.h>  //NOLINT
 #include <aws/s3/model/BucketLocationConstraint.h>  //NOLINT
 #include <aws/s3/model/CreateBucketConfiguration.h>  //NOLINT
-#include <aws/core/utils/threading/Executor.h>  // NOLINT
+#include <aws/core/utils/threading/Executor.h> // NOLINT
 #include "src/common/configuration.h"
 
 namespace curve {

diff --git a/src/kvstorageclient/BUILD b/src/kvstorageclient/BUILD
@@ -30,6 +30,6 @@ cc_library(
         "//external:glog",
         "//external:gflags",
         "//src/common:curve_common",
-        "//include/etcdclient:etcd_client",
+        "@etcdclient//:etcdclient",
     ],
 )
diff --git a/src/kvstorageclient/etcd_client.h b/src/kvstorageclient/etcd_client.h
@@ -23,9 +23,9 @@
 #ifndef SRC_KVSTORAGECLIENT_ETCD_CLIENT_H_
 #define SRC_KVSTORAGECLIENT_ETCD_CLIENT_H_
 
+#include <libetcdclient.h>
 #include <string>
 #include <vector>
-#include "include/etcdclient/etcdclient.h"
 
 namespace curve {
 namespace kvstorage {
@@ -236,5 +236,3 @@ class EtcdClientImp : public KVStorageClient {
 }  // namespace curve
 
 #endif  // SRC_KVSTORAGECLIENT_ETCD_CLIENT_H_
-
-
diff --git a/src/snapshotcloneserver/BUILD b/src/snapshotcloneserver/BUILD
@@ -53,11 +53,8 @@ cc_library(
         "-ldl",
         "-lz",
         "-lpthread",
-        "-laws-cpp-sdk-core",
-        "-laws-cpp-sdk-s3",
         "-lmysqlcppconn",
         "-luuid",
-        "-L/usr/local/lib",
     ],
     visibility = ["//visibility:public"],
     deps = [
@@ -98,11 +95,8 @@ cc_binary(
         "-ldl",
         "-lz",
         "-lpthread",
-        "-laws-cpp-sdk-core",
-        "-laws-cpp-sdk-s3",
         "-lmysqlcppconn",
         "-luuid",
-        "-L/usr/local/lib",
     ],
     visibility = ["//visibility:public"],
     deps = [

diff --git a/test/client/libcbd_libcurve_test.cpp b/test/client/libcbd_libcurve_test.cpp
@@ -295,7 +295,7 @@ TEST_F(TestLibcbdLibcurve, ReadAndCloseConcurrencyTest) {
     ASSERT_GE(fd2, 0);
 
     auto curvefsService = mds_->GetMDSService();
-    curvefsService->SetCloseFileTask([]() {
+    curvefsService->SetCloseFileTask([closeFileSleepS]() {
         std::this_thread::sleep_for(std::chrono::seconds(closeFileSleepS));
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,4 @@ cc_library( @@
             "-letcdclient",
         ]),
         visibility = ["//visibility:public"],
-    )
+    )