format chunkserver code

Change-Id: Idb30860e27f8d7f205aab62e000e34c6342620fc
gaowayne · Oct 18, 2018 · 751ca8d · 751ca8d
1 parent 56aef1c
commit 751ca8d
Show file tree

Hide file tree

Showing 58 changed files with 1,576 additions and 3,442 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,7 @@ bin
 lib
 build
 *.temp
+.clwb
 
 # cscope
 cscope.out
@@ -53,8 +54,8 @@ build.log
 
 
 # protobuf
-#*.pb.h
-#*.pb.cc
+*.pb.h
+*.pb.cc
 
 # bazel
 bazel-bin

diff --git a/BUILD b/BUILD
@@ -276,7 +276,7 @@ cc_test(
 #    hdrs = ["src/libcurve/interface/libcurve_fake.h"],
 #    deps = ["//proto:nameserver2_cc_proto"],
 #)
-#
+
 COPTS = [
     "-DGFLAGS=gflags",
     "-DOS_LINUX",
@@ -561,31 +561,16 @@ CHUNKSERVER_DEPS = [
 cc_binary(
     name = "chunkserver-test",
     srcs = glob([
-        "test/chunkserver/cli_test.cpp",
-        "test/chunkserver/chunk_service_test.cpp",
+        #        "test/chunkserver/cli_test.cpp",
+        #        "test/chunkserver/chunk_service_test.cpp",
         "test/chunkserver/copyset_node_manager_test.cpp",
         "test/chunkserver/op_request_test.cpp",
-    ]),
-    copts = [
-        "-Iexternal/gtest/include",
-        "-g",
-    ],
-    deps = CHUNKSERVER_DEPS,
-)
-
-cc_test(
-    name = "chunkserver-copyset-test",
-    srcs = glob([
         "test/chunkserver/copyset_service_test.cpp",
     ]),
-    copts = [
-        "-Iexternal/gtest/include",
-    ],
     deps = CHUNKSERVER_DEPS,
 )
 
 # tools
-
 cc_binary(
     name = "curve-cli",
     srcs = [

diff --git a/WORKSPACE b/WORKSPACE
@@ -24,15 +24,15 @@ bind(
 
 # glog deps
 new_git_repository(
-    name = "com_github_glog_glog",
+    name = "com_github_google_glog",
     build_file = "bazel/glog.BUILD",
     remote = "https://github.com/google/glog.git",
     tag = "v0.3.5",
 )
 
 bind(
     name = "glog",
-    actual = "@com_github_glog_glog//:glog",
+    actual = "@com_github_google_glog//:glog",
 )
 
 git_repository(

diff --git a/deploy/local/chunkserver/start_chunkservers_locally.sh b/deploy/local/chunkserver/start_chunkservers_locally.sh
@@ -7,6 +7,6 @@ log=${home}/log
 bin=bazel-bin
 #bin=.
 
-${bin}/chunkserver -bthread_concurrency=18 -crash_on_fatal_log=true -raft_max_segment_size=8388608 -raft_sync=true -minloglevel=0 -conf=${conf}/chunkserver.conf.0 > ${log}/chunkserver.log.0 2>&1 &
-${bin}/chunkserver -bthread_concurrency=18 -crash_on_fatal_log=true -raft_max_segment_size=8388608 -raft_sync=true -minloglevel=0 -conf=${conf}/chunkserver.conf.1 > ${log}/chunkserver.log.1 2>&1 &
-${bin}/chunkserver -bthread_concurrency=18 -crash_on_fatal_log=true -raft_max_segment_size=8388608 -raft_sync=true -minloglevel=0 -conf=${conf}/chunkserver.conf.2 > ${log}/chunkserver.log.2 2>&1 &
+${bin}/chunkserver -bthread_concurrency=18 -raft_max_segment_size=8388608 -raft_sync=true -minloglevel=0 -conf=${conf}/chunkserver.conf.0 > ${log}/chunkserver.log.0 2>&1 &
+${bin}/chunkserver -bthread_concurrency=18 -raft_max_segment_size=8388608 -raft_sync=true -minloglevel=0 -conf=${conf}/chunkserver.conf.1 > ${log}/chunkserver.log.1 2>&1 &
+${bin}/chunkserver -bthread_concurrency=18 -raft_max_segment_size=8388608 -raft_sync=true -minloglevel=0 -conf=${conf}/chunkserver.conf.2 > ${log}/chunkserver.log.2 2>&1 &
diff --git a/deploy/local/test/start_multicopyset_io_test.sh b/deploy/local/test/start_multicopyset_io_test.sh
@@ -2,8 +2,8 @@
 
 bin=bazel-bin
 #bin=.
-raftconf="172.17.0.2:8200:0,172.17.0.2:8201:0,172.17.0.2:8202:0"
-io_count=100
+raftconf="127.0.0.1:8200:0,127.0.0.1:8201:0,127.0.0.1:8202:0"
+io_count=10
 io_time=5
 io_mode=async
 iodepth=4
@@ -13,8 +13,8 @@ io_pattern=randwrite
 #io_pattern=write
 wait_mode=efficiency
 thread_num=2
-#verbose=-verbose
-verbose=
+verbose=-verbose
+#verbose=
 
 ${bin}/multi-copyset-io-test --raftconf=${raftconf} -io_count ${io_count} -request_size ${request_size} -io_pattern ${io_pattern} -io_time ${io_time} -io_mode=${io_mode} -wait_mode=${wait_mode} -iodepth=${iodepth} -thread_num ${thread_num} ${verbose}
 #${bin}/multi-copyset-io-test --raftconf=${raftconf} -io_count ${io_count} -io_time ${io_time} -thread_num ${thread_num} ${verbose}
diff --git a/include/curve_compiler_specific.h b/include/curve_compiler_specific.h
@@ -16,8 +16,8 @@
 // branch predict
 #if defined(COMPILER_GCC)
 #  if defined(__cplusplus)
-#    define CURVE_LIKELY(expr) (__builtin_expect(static_cast<bool>(expr), true))
-#    define CURVE_UNLIKELY(expr) (__builtin_expect(static_cast<bool>(expr), false))
+#    define CURVE_LIKELY(expr) (__builtin_expect(static_cast<bool>(expr), true))    //NOLINT
+#    define CURVE_UNLIKELY(expr) (__builtin_expect(static_cast<bool>(expr), false)) //NOLINT
 #  else
 #    define CURVE_LIKELY(expr) (__builtin_expect(!!(expr), 1))
 #    define CURVE_UNLIKELY(expr) (__builtin_expect(!!(expr), 0))