Skip to content

Commit

Permalink
change brpc/braft/glog/etcd repository url
Browse files Browse the repository at this point in the history
Change-Id: I412cc889ea648100b7d7dfba08d8404ee0f90bf3
  • Loading branch information
wu-hanqing committed Jul 15, 2020
1 parent b48ed73 commit f86e942
Show file tree
Hide file tree
Showing 8 changed files with 5,092 additions and 146 deletions.
24 changes: 13 additions & 11 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ workspace(name = "curve")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

git_repository(
name = "com_netease_storage_gerrit_curve_curve_braft",
remote = "http://gerrit.storage.netease.com/curve/curve-braft",
commit = "b17ebad68d1d1b84440f7bce984755ff47095137",
name = "com_github_baidu_braft",
remote = "https://github.com/baidu/braft",
commit = "e255c0e4b18d1a8a5d484d4b647f41ff1385ef1e",
patch_args = ["-p1"],
patches = ["//:thirdparties/braft/braft.patch"],
)

bind(
name = "braft",
actual = "@com_netease_storage_gerrit_curve_curve_braft//:braft",
actual = "@com_github_baidu_braft//:braft",
)

# proto_library, cc_proto_library, and java_proto_library rules implicitly
Expand Down Expand Up @@ -61,7 +63,7 @@ bind(
# brpc内BUILD文件在依赖glog时, 直接指定的依赖是"@com_github_google_glog//:glog"
git_repository(
name = "com_github_google_glog",
remote = "http://gerrit.storage.netease.com/curve/curve-glog",
remote = "https://github.com/google/glog",
commit = "4cc89c9e2b452db579397887c37f302fb28f6ca1",
patch_args = ["-p1"],
patches = ["//:thirdparties/glog/glog.patch"],
Expand Down Expand Up @@ -100,31 +102,31 @@ bind(
)

git_repository(
name = "com_netease_storage_gerrit_curve_curve_brpc",
remote = "http://gerrit.storage.netease.com/curve/curve-brpc",
name = "com_github_apache_brpc",
remote = "https://github.com/apache/incubator-brpc",
commit = "1b9e00641cbec1c8803da6a1f7f555398c954cb0",
patches = ["//:thirdparties/brpc/brpc.patch"],
patch_args = ["-p1"],
)

bind(
name = "brpc",
actual = "@com_netease_storage_gerrit_curve_curve_brpc//:brpc",
actual = "@com_github_apache_brpc//:brpc",
)

bind(
name = "butil",
actual = "@com_netease_storage_gerrit_curve_curve_brpc//:butil",
actual = "@com_github_apache_brpc//:butil",
)

bind(
name = "bthread",
actual = "@com_netease_storage_gerrit_curve_curve_brpc//:bthread",
actual = "@com_github_apache_brpc//:bthread",
)

bind(
name = "bvar",
actual = "@com_netease_storage_gerrit_curve_curve_brpc//:bvar",
actual = "@com_github_apache_brpc//:bvar",
)

# jsoncpp
Expand Down
17 changes: 17 additions & 0 deletions conf/s3.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#
# S3 options
#
s3.nos_address=
s3.snapshot_bucket_name=
s3.ak=
s3.sk=
# http = 0, https = 1
s3.http_scheme=0
s3.verify_SSL=false
s3.user_agent_conf=S3 Browser
s3.max_connections=32
s3.connect_timeout=60000
s3.request_timeout=10000
# Off = 0,Fatal = 1,Error = 2,Warn = 3,Info = 4,Debug = 5,Trace = 6
s3.loglevel=4
s3.async_thread_num=64
2 changes: 1 addition & 1 deletion test/chunkserver/cli2_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class Cli2Test : public testing::Test {

butil::AtExitManager atExitManager;

TEST_F(Cli2Test, basic) {
TEST_F(Cli2Test, DISABLED_basic) {
const char *ip = "127.0.0.1";
int port = 9033;
const char *confs = "127.0.0.1:9033:0,127.0.0.1:9034:0,127.0.0.1:9035:0";
Expand Down
2 changes: 1 addition & 1 deletion test/chunkserver/cli_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class CliTest : public testing::Test {

butil::AtExitManager atExitManager;

TEST_F(CliTest, basic) {
TEST_F(CliTest, DISABLED_basic) {
const char *ip = "127.0.0.1";
int port = 9030;
const char *confs = "127.0.0.1:9030:0,127.0.0.1:9031:0,127.0.0.1:9032:0";
Expand Down
2 changes: 1 addition & 1 deletion test/chunkserver/copyset_epoch_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class CopysetEpochTest : public testing::Test {

butil::AtExitManager atExitManager;

TEST_F(CopysetEpochTest, epoch_test) {
TEST_F(CopysetEpochTest, DISABLED_basic) {
const char *ip = "127.0.0.1";
int port = 9026;
const char *confs = "127.0.0.1:9026:0";
Expand Down
131 changes: 0 additions & 131 deletions test/common/test_s3_adapter.cpp

This file was deleted.

Loading

0 comments on commit f86e942

Please sign in to comment.