Rename remote bootstrap files to 'tablet copy'
Change-Id: I3f31fb72d11d16ee05bf90be3a7c77a82e5db6f7
Reviewed-on: http://gerrit.cloudera.org:8080/3853
Tested-by: Kudu Jenkins
Reviewed-by: Mike Percy <mpercy@apache.org>
diff --git a/src/kudu/integration-tests/CMakeLists.txt b/src/kudu/integration-tests/CMakeLists.txt
index 0c2d449..5b99b7f 100644
--- a/src/kudu/integration-tests/CMakeLists.txt
+++ b/src/kudu/integration-tests/CMakeLists.txt
@@ -59,8 +59,8 @@
ADD_KUDU_TEST(master-stress-test RESOURCE_LOCK "master-rpc-ports")
ADD_KUDU_TEST(raft_consensus-itest RUN_SERIAL true)
ADD_KUDU_TEST(registration-test RESOURCE_LOCK "master-web-port")
-ADD_KUDU_TEST(remote_bootstrap-itest)
ADD_KUDU_TEST(table_locations-itest)
+ADD_KUDU_TEST(tablet_copy-itest)
ADD_KUDU_TEST(tablet_replacement-itest)
ADD_KUDU_TEST(ts_recovery-itest)
ADD_KUDU_TEST(ts_tablet_manager-itest)
diff --git a/src/kudu/integration-tests/remote_bootstrap-itest.cc b/src/kudu/integration-tests/tablet_copy-itest.cc
similarity index 99%
rename from src/kudu/integration-tests/remote_bootstrap-itest.cc
rename to src/kudu/integration-tests/tablet_copy-itest.cc
index ec854bc..3106818 100644
--- a/src/kudu/integration-tests/remote_bootstrap-itest.cc
+++ b/src/kudu/integration-tests/tablet_copy-itest.cc
@@ -34,7 +34,7 @@
#include "kudu/integration-tests/test_workload.h"
#include "kudu/tablet/tablet_bootstrap.h"
#include "kudu/tablet/tablet_metadata.h"
-#include "kudu/tserver/remote_bootstrap_client.h"
+#include "kudu/tserver/tablet_copy_client.h"
#include "kudu/util/metrics.h"
#include "kudu/util/pstack_watcher.h"
#include "kudu/util/test_util.h"
diff --git a/src/kudu/tserver/CMakeLists.txt b/src/kudu/tserver/CMakeLists.txt
index a2e34e1..77b890d 100644
--- a/src/kudu/tserver/CMakeLists.txt
+++ b/src/kudu/tserver/CMakeLists.txt
@@ -16,14 +16,14 @@
# under the License.
#########################################
-# remote_bootstrap_proto
+# tablet_copy_proto
#########################################
KRPC_GENERATE(
TABLET_COPY_KRPC_SRCS TABLET_COPY_KRPC_HDRS TABLET_COPY_KRPC_TGTS
SOURCE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..
BINARY_ROOT ${CMAKE_CURRENT_BINARY_DIR}/../..
- PROTO_FILES remote_bootstrap.proto)
+ PROTO_FILES tablet_copy.proto)
set(TABLET_COPY_KRPC_LIBS
consensus_proto
krpc
@@ -31,7 +31,7 @@
rpc_header_proto
tablet_proto
wire_protocol_proto)
-ADD_EXPORTABLE_LIBRARY(remote_bootstrap_proto
+ADD_EXPORTABLE_LIBRARY(tablet_copy_proto
SRCS ${TABLET_COPY_KRPC_SRCS}
DEPS ${TABLET_COPY_KRPC_LIBS}
NONLINK_DEPS ${TABLET_COPY_KRPC_TGTS})
@@ -89,8 +89,8 @@
krpc
kudu_common_proto
protobuf
- remote_bootstrap_proto
rpc_header_proto
+ tablet_copy_proto
tserver_proto
wire_protocol_proto)
ADD_EXPORTABLE_LIBRARY(tserver_service_proto
@@ -105,11 +105,11 @@
set(TSERVER_SRCS
heartbeater.cc
mini_tablet_server.cc
- remote_bootstrap_client.cc
- remote_bootstrap_service.cc
- remote_bootstrap_session.cc
scanner_metrics.cc
scanners.cc
+ tablet_copy_client.cc
+ tablet_copy_service.cc
+ tablet_copy_session.cc
tablet_server.cc
tablet_server_options.cc
tablet_service.cc
@@ -120,10 +120,10 @@
add_library(tserver ${TSERVER_SRCS})
target_link_libraries(tserver
protobuf
+ tablet_copy_proto
tserver_proto
tserver_admin_proto
tserver_service_proto
- remote_bootstrap_proto
master_rpc
master_proto
consensus_proto
@@ -164,9 +164,9 @@
tserver
tserver_test_util
${KUDU_MIN_TEST_LIBS})
-ADD_KUDU_TEST(remote_bootstrap_client-test)
-ADD_KUDU_TEST(remote_bootstrap_session-test)
-ADD_KUDU_TEST(remote_bootstrap_service-test)
+ADD_KUDU_TEST(tablet_copy_client-test)
+ADD_KUDU_TEST(tablet_copy_session-test)
+ADD_KUDU_TEST(tablet_copy_service-test)
ADD_KUDU_TEST(tablet_server-test)
ADD_KUDU_TEST(tablet_server-stress-test RUN_SERIAL true)
ADD_KUDU_TEST(scanners-test)
diff --git a/src/kudu/tserver/remote_bootstrap-test-base.h b/src/kudu/tserver/tablet_copy-test-base.h
similarity index 98%
rename from src/kudu/tserver/remote_bootstrap-test-base.h
rename to src/kudu/tserver/tablet_copy-test-base.h
index 0f7faa1..bdd4a42 100644
--- a/src/kudu/tserver/remote_bootstrap-test-base.h
+++ b/src/kudu/tserver/tablet_copy-test-base.h
@@ -26,7 +26,7 @@
#include "kudu/fs/block_manager.h"
#include "kudu/gutil/strings/fastmem.h"
#include "kudu/tablet/metadata.pb.h"
-#include "kudu/tserver/remote_bootstrap.pb.h"
+#include "kudu/tserver/tablet_copy.pb.h"
#include "kudu/util/crc.h"
#include "kudu/util/stopwatch.h"
#include "kudu/util/test_util.h"
diff --git a/src/kudu/tserver/remote_bootstrap.proto b/src/kudu/tserver/tablet_copy.proto
similarity index 100%
rename from src/kudu/tserver/remote_bootstrap.proto
rename to src/kudu/tserver/tablet_copy.proto
diff --git a/src/kudu/tserver/remote_bootstrap_client-test.cc b/src/kudu/tserver/tablet_copy_client-test.cc
similarity index 98%
rename from src/kudu/tserver/remote_bootstrap_client-test.cc
rename to src/kudu/tserver/tablet_copy_client-test.cc
index d1bfc16..5fd3a6c 100644
--- a/src/kudu/tserver/remote_bootstrap_client-test.cc
+++ b/src/kudu/tserver/tablet_copy_client-test.cc
@@ -14,12 +14,12 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tserver/remote_bootstrap-test-base.h"
+#include "kudu/tserver/tablet_copy-test-base.h"
#include "kudu/consensus/quorum_util.h"
#include "kudu/gutil/strings/fastmem.h"
#include "kudu/tablet/tablet_bootstrap.h"
-#include "kudu/tserver/remote_bootstrap_client.h"
+#include "kudu/tserver/tablet_copy_client.h"
#include "kudu/util/env_util.h"
using std::shared_ptr;
diff --git a/src/kudu/tserver/remote_bootstrap_client.cc b/src/kudu/tserver/tablet_copy_client.cc
similarity index 99%
rename from src/kudu/tserver/remote_bootstrap_client.cc
rename to src/kudu/tserver/tablet_copy_client.cc
index a7cdde1..56d1837 100644
--- a/src/kudu/tserver/remote_bootstrap_client.cc
+++ b/src/kudu/tserver/tablet_copy_client.cc
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tserver/remote_bootstrap_client.h"
+#include "kudu/tserver/tablet_copy_client.h"
#include <gflags/gflags.h>
#include <glog/logging.h>
@@ -34,8 +34,8 @@
#include "kudu/tablet/tablet.pb.h"
#include "kudu/tablet/tablet_bootstrap.h"
#include "kudu/tablet/tablet_peer.h"
-#include "kudu/tserver/remote_bootstrap.pb.h"
-#include "kudu/tserver/remote_bootstrap.proxy.h"
+#include "kudu/tserver/tablet_copy.pb.h"
+#include "kudu/tserver/tablet_copy.proxy.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/util/crc.h"
#include "kudu/util/env.h"
diff --git a/src/kudu/tserver/remote_bootstrap_client.h b/src/kudu/tserver/tablet_copy_client.h
similarity index 100%
rename from src/kudu/tserver/remote_bootstrap_client.h
rename to src/kudu/tserver/tablet_copy_client.h
diff --git a/src/kudu/tserver/remote_bootstrap_service-test.cc b/src/kudu/tserver/tablet_copy_service-test.cc
similarity index 99%
rename from src/kudu/tserver/remote_bootstrap_service-test.cc
rename to src/kudu/tserver/tablet_copy_service-test.cc
index 1b5baf2..b50c5fe 100644
--- a/src/kudu/tserver/remote_bootstrap_service-test.cc
+++ b/src/kudu/tserver/tablet_copy_service-test.cc
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tserver/remote_bootstrap-test-base.h"
+#include "kudu/tserver/tablet_copy-test-base.h"
#include <gflags/gflags.h>
#include <limits>
@@ -28,7 +28,7 @@
#include "kudu/consensus/opid_util.h"
#include "kudu/rpc/rpc_header.pb.h"
#include "kudu/rpc/transfer.h"
-#include "kudu/tserver/remote_bootstrap.pb.h"
+#include "kudu/tserver/tablet_copy.pb.h"
#include "kudu/tserver/tserver_service.pb.h"
#include "kudu/tserver/tserver_service.proxy.h"
#include "kudu/util/crc.h"
diff --git a/src/kudu/tserver/remote_bootstrap_service.cc b/src/kudu/tserver/tablet_copy_service.cc
similarity index 98%
rename from src/kudu/tserver/remote_bootstrap_service.cc
rename to src/kudu/tserver/tablet_copy_service.cc
index 1d7104c..62168a7 100644
--- a/src/kudu/tserver/remote_bootstrap_service.cc
+++ b/src/kudu/tserver/tablet_copy_service.cc
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tserver/remote_bootstrap_service.h"
+#include "kudu/tserver/tablet_copy_service.h"
#include <algorithm>
#include <gflags/gflags.h>
@@ -28,7 +28,7 @@
#include "kudu/gutil/strings/substitute.h"
#include "kudu/gutil/map-util.h"
#include "kudu/rpc/rpc_context.h"
-#include "kudu/tserver/remote_bootstrap_session.h"
+#include "kudu/tserver/tablet_copy_session.h"
#include "kudu/tserver/tablet_peer_lookup.h"
#include "kudu/tablet/tablet_peer.h"
#include "kudu/util/crc.h"
diff --git a/src/kudu/tserver/remote_bootstrap_service.h b/src/kudu/tserver/tablet_copy_service.h
similarity index 98%
rename from src/kudu/tserver/remote_bootstrap_service.h
rename to src/kudu/tserver/tablet_copy_service.h
index a5eab8c..180dc1b 100644
--- a/src/kudu/tserver/remote_bootstrap_service.h
+++ b/src/kudu/tserver/tablet_copy_service.h
@@ -22,7 +22,7 @@
#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/ref_counted.h"
-#include "kudu/tserver/remote_bootstrap.service.h"
+#include "kudu/tserver/tablet_copy.service.h"
#include "kudu/util/countdown_latch.h"
#include "kudu/util/locks.h"
#include "kudu/util/metrics.h"
diff --git a/src/kudu/tserver/remote_bootstrap_session-test.cc b/src/kudu/tserver/tablet_copy_session-test.cc
similarity index 99%
rename from src/kudu/tserver/remote_bootstrap_session-test.cc
rename to src/kudu/tserver/tablet_copy_session-test.cc
index 0f0236a..aa104b5 100644
--- a/src/kudu/tserver/remote_bootstrap_session-test.cc
+++ b/src/kudu/tserver/tablet_copy_session-test.cc
@@ -33,7 +33,7 @@
#include "kudu/gutil/strings/fastmem.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/messenger.h"
-#include "kudu/tserver/remote_bootstrap_session.h"
+#include "kudu/tserver/tablet_copy_session.h"
#include "kudu/tablet/tablet_peer.h"
#include "kudu/util/crc.h"
#include "kudu/util/metrics.h"
diff --git a/src/kudu/tserver/remote_bootstrap_session.cc b/src/kudu/tserver/tablet_copy_session.cc
similarity index 99%
rename from src/kudu/tserver/remote_bootstrap_session.cc
rename to src/kudu/tserver/tablet_copy_session.cc
index 61d79df..0b601c4 100644
--- a/src/kudu/tserver/remote_bootstrap_session.cc
+++ b/src/kudu/tserver/tablet_copy_session.cc
@@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tserver/remote_bootstrap_session.h"
+#include "kudu/tserver/tablet_copy_session.h"
#include <algorithm>
#include <mutex>
diff --git a/src/kudu/tserver/remote_bootstrap_session.h b/src/kudu/tserver/tablet_copy_session.h
similarity index 99%
rename from src/kudu/tserver/remote_bootstrap_session.h
rename to src/kudu/tserver/tablet_copy_session.h
index 7eb2383..d05f70a 100644
--- a/src/kudu/tserver/remote_bootstrap_session.h
+++ b/src/kudu/tserver/tablet_copy_session.h
@@ -31,7 +31,7 @@
#include "kudu/gutil/macros.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stl_util.h"
-#include "kudu/tserver/remote_bootstrap.pb.h"
+#include "kudu/tserver/tablet_copy.pb.h"
#include "kudu/util/env_util.h"
#include "kudu/util/locks.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/tserver/tablet_server-test-base.h b/src/kudu/tserver/tablet_server-test-base.h
index b60caba..736c5ca 100644
--- a/src/kudu/tserver/tablet_server-test-base.h
+++ b/src/kudu/tserver/tablet_server-test-base.h
@@ -43,7 +43,7 @@
#include "kudu/tablet/tablet.h"
#include "kudu/tablet/tablet_peer.h"
#include "kudu/tserver/mini_tablet_server.h"
-#include "kudu/tserver/remote_bootstrap.proxy.h"
+#include "kudu/tserver/tablet_copy.proxy.h"
#include "kudu/tserver/scanners.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/tablet_server_test_util.h"
diff --git a/src/kudu/tserver/tablet_server.cc b/src/kudu/tserver/tablet_server.cc
index 14f2049..0ae70b9 100644
--- a/src/kudu/tserver/tablet_server.cc
+++ b/src/kudu/tserver/tablet_server.cc
@@ -32,7 +32,7 @@
#include "kudu/tserver/tablet_service.h"
#include "kudu/tserver/ts_tablet_manager.h"
#include "kudu/tserver/tserver-path-handlers.h"
-#include "kudu/tserver/remote_bootstrap_service.h"
+#include "kudu/tserver/tablet_copy_service.h"
#include "kudu/util/maintenance_manager.h"
#include "kudu/util/net/net_util.h"
#include "kudu/util/net/sockaddr.h"
diff --git a/src/kudu/tserver/tablet_service.cc b/src/kudu/tserver/tablet_service.cc
index 8ae9424..586e82b 100644
--- a/src/kudu/tserver/tablet_service.cc
+++ b/src/kudu/tserver/tablet_service.cc
@@ -42,7 +42,7 @@
#include "kudu/tablet/tablet_peer.h"
#include "kudu/tablet/transactions/alter_schema_transaction.h"
#include "kudu/tablet/transactions/write_transaction.h"
-#include "kudu/tserver/remote_bootstrap_service.h"
+#include "kudu/tserver/tablet_copy_service.h"
#include "kudu/tserver/scanners.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/ts_tablet_manager.h"
diff --git a/src/kudu/tserver/ts_tablet_manager.cc b/src/kudu/tserver/ts_tablet_manager.cc
index 14558c5..a1fff30 100644
--- a/src/kudu/tserver/ts_tablet_manager.cc
+++ b/src/kudu/tserver/ts_tablet_manager.cc
@@ -45,7 +45,7 @@
#include "kudu/tablet/tablet_metadata.h"
#include "kudu/tablet/tablet_peer.h"
#include "kudu/tserver/heartbeater.h"
-#include "kudu/tserver/remote_bootstrap_client.h"
+#include "kudu/tserver/tablet_copy_client.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/tablet_service.h"
#include "kudu/util/debug/trace_event.h"
