Rename "topology master" to "topology manager" (#3624)

Author: armadillojim

deploy/docker/README.md

@@ -57,11 +57,11 @@ root@16092325a696:/heron# heron submit sandbox /heron/examples/heron-api-example
 [2018-02-01 20:24:21 +0000] [INFO]: Successfully launched topology 'exclamation' 
 root@16092325a696:/heron# heron deactivate sandbox exclamation
 [2018-02-01 20:24:46 +0000] [INFO]: Using cluster definition in /heron/heron-tools/conf/sandbox
-[2018-02-01 20:24:47 +0000] [INFO] org.apache.heron.spi.utils.TMasterUtils: Topology command DEACTIVATE completed successfully.
+[2018-02-01 20:24:47 +0000] [INFO] org.apache.heron.spi.utils.TManagerUtils: Topology command DEACTIVATE completed successfully.
 [2018-02-01 20:24:47 +0000] [INFO]: Successfully deactivate topology: exclamation
 root@16092325a696:/heron# heron activate sandbox exclamation
 [2018-02-01 20:24:55 +0000] [INFO]: Using cluster definition in /heron/heron-tools/conf/sandbox
-[2018-02-01 20:24:56 +0000] [INFO] org.apache.heron.spi.utils.TMasterUtils: Topology command ACTIVATE completed successfully.
+[2018-02-01 20:24:56 +0000] [INFO] org.apache.heron.spi.utils.TManagerUtils: Topology command ACTIVATE completed successfully.
 [2018-02-01 20:24:56 +0000] [INFO]: Successfully activate topology: exclamation
 root@16092325a696:/heron# heron kill sandbox exclamation
 [2018-02-01 20:25:08 +0000] [INFO]: Using cluster definition in /heron/heron-tools/conf/sandbox

heron/api/src/java/org/apache/heron/api/bolt/IBolt.java

@@ -34,7 +34,7 @@
  * <p>A bolt's lifecycle is as follows:</p>
  * <p>
  * <p>IBolt object created on client machine. The IBolt is serialized into the topology
- * (using Java serialization) and submitted to the master machine of the cluster (Nimbus).
+ * (using Java serialization) and submitted to the primary machine of the cluster (Nimbus).
  * Nimbus then launches workers which deserialize the object, call prepare on it, and then
  * start processing tuples.</p>
  * <p>

heron/ckptmgr/src/java/org/apache/heron/ckptmgr/CheckpointManager.java

@@ -254,7 +254,7 @@ public static void main(String[] args) throws IOException,
     Level loggingLevel = Level.INFO;
     String loggingDir = systemConfig.getHeronLoggingDirectory();
 
-    // Log to file and TMaster
+    // Log to file and TManager
     LoggingHelper.loggerInit(loggingLevel, true);
     LoggingHelper.addLoggingHandler(
         LoggingHelper.getFileHandler(ckptmgrId, loggingDir, true,

heron/ckptmgr/src/java/org/apache/heron/ckptmgr/CheckpointManagerServer.java

@@ -82,7 +82,7 @@ public CheckpointManagerServer(
   private void registerInitialization() {
     registerOnRequest(CheckpointManager.RegisterStMgrRequest.newBuilder());
 
-    registerOnRequest(CheckpointManager.RegisterTMasterRequest.newBuilder());
+    registerOnRequest(CheckpointManager.RegisterTManagerRequest.newBuilder());
 
     registerOnRequest(CheckpointManager.SaveInstanceStateRequest.newBuilder());
 
@@ -101,9 +101,9 @@ public void onConnect(SocketChannel channel) {
   public void onRequest(REQID rid, SocketChannel channel, Message request) {
     if (request instanceof CheckpointManager.RegisterStMgrRequest) {
       handleStMgrRegisterRequest(rid, channel, (CheckpointManager.RegisterStMgrRequest) request);
-    } else if (request instanceof CheckpointManager.RegisterTMasterRequest) {
-      handleTMasterRegisterRequest(rid, channel,
-                                   (CheckpointManager.RegisterTMasterRequest) request);
+    } else if (request instanceof CheckpointManager.RegisterTManagerRequest) {
+      handleTManagerRegisterRequest(rid, channel,
+                                   (CheckpointManager.RegisterTManagerRequest) request);
     } else if (request instanceof CheckpointManager.SaveInstanceStateRequest) {
       handleSaveInstanceStateRequest(
           rid, channel, (CheckpointManager.SaveInstanceStateRequest) request);
@@ -153,20 +153,20 @@ protected void handleCleanStatefulCheckpointRequest(
     sendResponse(rid, channel, responseBuilder.build());
   }
 
-  protected void handleTMasterRegisterRequest(
+  protected void handleTManagerRegisterRequest(
       REQID rid,
       SocketChannel channel,
-      CheckpointManager.RegisterTMasterRequest request
+      CheckpointManager.RegisterTManagerRequest request
   ) {
-    LOG.info("Got a TMaster register request from TMaster host:port "
+    LOG.info("Got a TManager register request from TManager host:port "
         + channel.socket().getRemoteSocketAddress());
 
-    CheckpointManager.RegisterTMasterResponse.Builder responseBuilder =
-        CheckpointManager.RegisterTMasterResponse.newBuilder();
+    CheckpointManager.RegisterTManagerResponse.Builder responseBuilder =
+        CheckpointManager.RegisterTManagerResponse.newBuilder();
 
     if (!checkRegistrationValidity(request.getTopologyName(),
                                    request.getTopologyId())) {
-      String errorMessage = String.format("The TMaster register message came with a different "
+      String errorMessage = String.format("The TManager register message came with a different "
                                + "topologyName: %s and/or topologyId: %s",
                                request.getTopologyName(),
                                request.getTopologyId());

heron/ckptmgr/tests/java/org/apache/heron/ckptmgr/CheckpointManagerServerTest.java

@@ -64,7 +64,7 @@ public class CheckpointManagerServerTest {
   private static CheckpointManager.GetInstanceStateRequest getInstanceStateRequest;
   private static CheckpointManager.CleanStatefulCheckpointRequest cleanStatefulCheckpointRequest;
   private static CheckpointManager.RegisterStMgrRequest registerStmgrRequest;
-  private static CheckpointManager.RegisterTMasterRequest registerTMasterRequest;
+  private static CheckpointManager.RegisterTManagerRequest registerTManagerRequest;
 
   private static PhysicalPlans.Instance instance;
 
@@ -137,7 +137,7 @@ public static void setup() throws Exception {
         .setPhysicalPlan(pplan)
         .build();
 
-    registerTMasterRequest = CheckpointManager.RegisterTMasterRequest.newBuilder()
+    registerTManagerRequest = CheckpointManager.RegisterTManagerRequest.newBuilder()
         .setTopologyId(TOPOLOGY_ID)
         .setTopologyName(TOPOLOGY_NAME)
         .build();
@@ -224,10 +224,10 @@ public void handleResponse(HeronClient client, StatusCode status,
   }
 
   @Test
-  public void testRegisterTMaster() throws Exception {
-    runTest(TestRequestHandler.RequestType.REGISTER_TMASTER,
+  public void testRegisterTManager() throws Exception {
+    runTest(TestRequestHandler.RequestType.REGISTER_TMANAGER,
         new HeronServerTester.SuccessResponseHandler(
-            CheckpointManager.RegisterTMasterResponse.class));
+            CheckpointManager.RegisterTManagerResponse.class));
   }
 
   @Test
@@ -249,8 +249,8 @@ public enum RequestType {
           CheckpointManager.CleanStatefulCheckpointResponse.getDescriptor()),
       REGISTER_STMGR(registerStmgrRequest,
           CheckpointManager.RegisterStMgrResponse.getDescriptor()),
-      REGISTER_TMASTER(registerTMasterRequest,
-          CheckpointManager.RegisterTMasterResponse.getDescriptor());
+      REGISTER_TMANAGER(registerTManagerRequest,
+          CheckpointManager.RegisterTManagerResponse.getDescriptor());
 
       private Message requestMessage;
       private Descriptors.Descriptor responseMessageDescriptor;

heron/common/src/cpp/config/heron-internals-config-reader.cpp

@@ -105,8 +105,8 @@ sp_int32 HeronInternalsConfigReader::GetHeronLoggingMaximumFiles() {
   return config_[HeronInternalsConfigVars::HERON_LOGGING_MAXIMUM_FILES].as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetCheckTMasterLocationIntervalSec() {
-  return config_[HeronInternalsConfigVars::HERON_CHECK_TMASTER_LOCATION_INTERVAL_SEC].as<int>();
+sp_int32 HeronInternalsConfigReader::GetCheckTManagerLocationIntervalSec() {
+  return config_[HeronInternalsConfigVars::HERON_CHECK_TMANAGER_LOCATION_INTERVAL_SEC].as<int>();
 }
 
 sp_int32 HeronInternalsConfigReader::GetHeronLoggingPruneIntervalSec() {
@@ -158,8 +158,8 @@ sp_int32 HeronInternalsConfigReader::GetHeronMetricsmgrScribePeriodicFlushInterv
       .as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronMetricsmgrReconnectTmasterIntervalSec() {
-  return config_[HeronInternalsConfigVars::HERON_METRICSMGR_RECONNECT_TMASTER_INTERVAL_SEC]
+sp_int32 HeronInternalsConfigReader::GetHeronMetricsmgrReconnectTmanagerIntervalSec() {
+  return config_[HeronInternalsConfigVars::HERON_METRICSMGR_RECONNECT_TMANAGER_INTERVAL_SEC]
       .as<int>();
 }
 
@@ -168,52 +168,52 @@ sp_int32 HeronInternalsConfigReader::GetHeronMetricsmgrNetworkOptionsMaximumPack
       .as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronTmasterMetricsCollectorMaximumIntervalMin() {
-  return config_[HeronInternalsConfigVars::HERON_TMASTER_METRICS_COLLECTOR_MAXIMUM_INTERVAL_MIN]
+sp_int32 HeronInternalsConfigReader::GetHeronTmanagerMetricsCollectorMaximumIntervalMin() {
+  return config_[HeronInternalsConfigVars::HERON_TMANAGER_METRICS_COLLECTOR_MAXIMUM_INTERVAL_MIN]
       .as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronTmasterEstablishRetryTimes() {
-  return config_[HeronInternalsConfigVars::HERON_TMASTER_ESTABLISH_RETRY_TIMES].as<int>();
+sp_int32 HeronInternalsConfigReader::GetHeronTmanagerEstablishRetryTimes() {
+  return config_[HeronInternalsConfigVars::HERON_TMANAGER_ESTABLISH_RETRY_TIMES].as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronTmasterEstablishRetryIntervalSec() {
-  return config_[HeronInternalsConfigVars::HERON_TMASTER_ESTABLISH_RETRY_INTERVAL_SEC].as<int>();
+sp_int32 HeronInternalsConfigReader::GetHeronTmanagerEstablishRetryIntervalSec() {
+  return config_[HeronInternalsConfigVars::HERON_TMANAGER_ESTABLISH_RETRY_INTERVAL_SEC].as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronTmasterNetworkMasterOptionsMaximumPacketMb() {
-  return config_[HeronInternalsConfigVars::HERON_TMASTER_NETWORK_MASTER_OPTIONS_MAXIMUM_PACKET_MB]
+sp_int32 HeronInternalsConfigReader::GetHeronTmanagerNetworkServerOptionsMaximumPacketMb() {
+  return config_[HeronInternalsConfigVars::HERON_TMANAGER_NETWORK_SERVER_OPTIONS_MAXIMUM_PACKET_MB]
       .as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronTmasterNetworkControllerOptionsMaximumPacketMb() {
+sp_int32 HeronInternalsConfigReader::GetHeronTmanagerNetworkControllerOptionsMaximumPacketMb() {
   return config_
-      [HeronInternalsConfigVars::HERON_TMASTER_NETWORK_CONTROLLER_OPTIONS_MAXIMUM_PACKET_MB]
+      [HeronInternalsConfigVars::HERON_TMANAGER_NETWORK_CONTROLLER_OPTIONS_MAXIMUM_PACKET_MB]
           .as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronTmasterNetworkStatsOptionsMaximumPacketMb() {
-  return config_[HeronInternalsConfigVars::HERON_TMASTER_NETWORK_STATS_OPTIONS_MAXIMUM_PACKET_MB]
+sp_int32 HeronInternalsConfigReader::GetHeronTmanagerNetworkStatsOptionsMaximumPacketMb() {
+  return config_[HeronInternalsConfigVars::HERON_TMANAGER_NETWORK_STATS_OPTIONS_MAXIMUM_PACKET_MB]
       .as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronTmasterMetricsCollectorPurgeIntervalSec() {
-  return config_[HeronInternalsConfigVars::HERON_TMASTER_METRICS_COLLECTOR_PURGE_INTERVAL_SEC]
+sp_int32 HeronInternalsConfigReader::GetHeronTmanagerMetricsCollectorPurgeIntervalSec() {
+  return config_[HeronInternalsConfigVars::HERON_TMANAGER_METRICS_COLLECTOR_PURGE_INTERVAL_SEC]
       .as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronTmasterMetricsCollectorMaximumException() {
-  return config_[HeronInternalsConfigVars::HERON_TMASTER_METRICS_COLLECTOR_MAXIMUM_EXCEPTION]
+sp_int32 HeronInternalsConfigReader::GetHeronTmanagerMetricsCollectorMaximumException() {
+  return config_[HeronInternalsConfigVars::HERON_TMANAGER_METRICS_COLLECTOR_MAXIMUM_EXCEPTION]
       .as<int>();
 }
 
-bool HeronInternalsConfigReader::GetHeronTmasterMetricsNetworkBindAllInterfaces() {
-  return config_[HeronInternalsConfigVars::HERON_TMASTER_METRICS_NETWORK_BINDALLINTERFACES]
+bool HeronInternalsConfigReader::GetHeronTmanagerMetricsNetworkBindAllInterfaces() {
+  return config_[HeronInternalsConfigVars::HERON_TMANAGER_METRICS_NETWORK_BINDALLINTERFACES]
       .as<bool>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronTmasterStmgrStateTimeoutSec() {
-  return config_[HeronInternalsConfigVars::HERON_TMASTER_STMGR_STATE_TIMEOUT_SEC].as<int>();
+sp_int32 HeronInternalsConfigReader::GetHeronTmanagerStmgrStateTimeoutSec() {
+  return config_[HeronInternalsConfigVars::HERON_TMANAGER_STMGR_STATE_TIMEOUT_SEC].as<int>();
 }
 
 sp_int32 HeronInternalsConfigReader::GetHeronStreammgrCacheDrainFrequencyMs() {
@@ -237,17 +237,17 @@ sp_int32 HeronInternalsConfigReader::GetHeronStreammgrXormgrRotatingmapNbuckets(
   return config_[HeronInternalsConfigVars::HERON_STREAMMGR_XORMGR_ROTATINGMAP_NBUCKETS].as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronStreammgrClientReconnectTmasterMaxAttempts() {
-  return config_[HeronInternalsConfigVars::HERON_STREAMMGR_CLIENT_RECONNECT_TMASTER_MAX_ATTEMPTS]
+sp_int32 HeronInternalsConfigReader::GetHeronStreammgrClientReconnectTmanagerMaxAttempts() {
+  return config_[HeronInternalsConfigVars::HERON_STREAMMGR_CLIENT_RECONNECT_TMANAGER_MAX_ATTEMPTS]
       .as<int>();
 }
 
 sp_int32 HeronInternalsConfigReader::GetHeronStreammgrClientReconnectIntervalSec() {
   return config_[HeronInternalsConfigVars::HERON_STREAMMGR_CLIENT_RECONNECT_INTERVAL_SEC].as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronStreammgrClientReconnectTmasterIntervalSec() {
-  return config_[HeronInternalsConfigVars::HERON_STREAMMGR_CLIENT_RECONNECT_TMASTER_INTERVAL_SEC]
+sp_int32 HeronInternalsConfigReader::GetHeronStreammgrClientReconnectTmanagerIntervalSec() {
+  return config_[HeronInternalsConfigVars::HERON_STREAMMGR_CLIENT_RECONNECT_TMANAGER_INTERVAL_SEC]
       .as<int>();
 }
 
@@ -256,8 +256,8 @@ sp_int32 HeronInternalsConfigReader::GetHeronStreammgrNetworkOptionsMaximumPacke
       .as<int>();
 }
 
-sp_int32 HeronInternalsConfigReader::GetHeronStreammgrTmasterHeartbeatIntervalSec() {
-  return config_[HeronInternalsConfigVars::HERON_STREAMMGR_TMASTER_HEARTBEAT_INTERVAL_SEC]
+sp_int32 HeronInternalsConfigReader::GetHeronStreammgrTmanagerHeartbeatIntervalSec() {
+  return config_[HeronInternalsConfigVars::HERON_STREAMMGR_TMANAGER_HEARTBEAT_INTERVAL_SEC]
       .as<int>();
 }
 

heron/common/src/cpp/config/heron-internals-config-reader.h

@@ -65,9 +65,9 @@ class HeronInternalsConfigReader : public YamlFileReader {
   // The maximum number of log files
   sp_int32 GetHeronLoggingMaximumFiles();
 
-  // The interval after which we check if the tmaster location
+  // The interval after which we check if the tmanager location
   // has been set or not
-  sp_int32 GetCheckTMasterLocationIntervalSec();
+  sp_int32 GetCheckTManagerLocationIntervalSec();
 
   // The interval in seconds to prune logging files in C+++
   sp_int32 GetHeronLoggingPruneIntervalSec();
@@ -105,44 +105,44 @@ class HeronInternalsConfigReader : public YamlFileReader {
   // The interval in seconds to flush cached metircs to scribe
   sp_int32 GetHeronMetricsmgrScribePeriodicFlushIntervalSec();
 
-  // The interval in seconds to reconnect to tmaster if a connection failure happens
-  sp_int32 GetHeronMetricsmgrReconnectTmasterIntervalSec();
+  // The interval in seconds to reconnect to tmanager if a connection failure happens
+  sp_int32 GetHeronMetricsmgrReconnectTmanagerIntervalSec();
 
   // The maximum packet size in MB of metrics manager's network options
   sp_int32 GetHeronMetricsmgrNetworkOptionsMaximumPacketMb();
 
   /**
-  * Tmaster Config Getters
+  * Tmanager Config Getters
   **/
-  // The maximum interval in minutes of metrics to be kept in tmaster
-  sp_int32 GetHeronTmasterMetricsCollectorMaximumIntervalMin();
+  // The maximum interval in minutes of metrics to be kept in tmanager
+  sp_int32 GetHeronTmanagerMetricsCollectorMaximumIntervalMin();
 
-  // The maximum time to retry to establish the tmaster
-  sp_int32 GetHeronTmasterEstablishRetryTimes();
+  // The maximum time to retry to establish the tmanager
+  sp_int32 GetHeronTmanagerEstablishRetryTimes();
 
-  // The interval to retry to establish the tmaster
-  sp_int32 GetHeronTmasterEstablishRetryIntervalSec();
+  // The interval to retry to establish the tmanager
+  sp_int32 GetHeronTmanagerEstablishRetryIntervalSec();
 
-  // The maximum packet size in MB of tmaster's network options for stmgrs to connect to
-  sp_int32 GetHeronTmasterNetworkMasterOptionsMaximumPacketMb();
+  // The maximum packet size in MB of tmanager's network options for stmgrs to connect to
+  sp_int32 GetHeronTmanagerNetworkServerOptionsMaximumPacketMb();
 
-  // The maximum packet size in MB of tmaster's network options for scheduler to connect to
-  sp_int32 GetHeronTmasterNetworkControllerOptionsMaximumPacketMb();
+  // The maximum packet size in MB of tmanager's network options for scheduler to connect to
+  sp_int32 GetHeronTmanagerNetworkControllerOptionsMaximumPacketMb();
 
-  // The maximum packet size in MB of tmaster's network options for stat queries
-  sp_int32 GetHeronTmasterNetworkStatsOptionsMaximumPacketMb();
+  // The maximum packet size in MB of tmanager's network options for stat queries
+  sp_int32 GetHeronTmanagerNetworkStatsOptionsMaximumPacketMb();
 
-  // The inteval for tmaster to purge metrics from socket
-  sp_int32 GetHeronTmasterMetricsCollectorPurgeIntervalSec();
+  // The inteval for tmanager to purge metrics from socket
+  sp_int32 GetHeronTmanagerMetricsCollectorPurgeIntervalSec();
 
   // The maximum # of exception to be stored in tmetrics collector, to prevent potential OOM
-  sp_int32 GetHeronTmasterMetricsCollectorMaximumException();
+  sp_int32 GetHeronTmanagerMetricsCollectorMaximumException();
 
   // Should metrics server bind on all interfaces
-  bool GetHeronTmasterMetricsNetworkBindAllInterfaces();
+  bool GetHeronTmanagerMetricsNetworkBindAllInterfaces();
 
   // The timeout in seconds for stream mgr, compared with (current time - last heartbeat time)
-  sp_int32 GetHeronTmasterStmgrStateTimeoutSec();
+  sp_int32 GetHeronTmanagerStmgrStateTimeoutSec();
 
   /**
   * Stream manager Config Getters
@@ -167,16 +167,16 @@ class HeronInternalsConfigReader : public YamlFileReader {
   sp_int32 GetHeronStreammgrClientReconnectIntervalSec();
 
   // The reconnect interval to tamster in second for stream manager client
-  sp_int32 GetHeronStreammgrClientReconnectTmasterIntervalSec();
+  sp_int32 GetHeronStreammgrClientReconnectTmanagerIntervalSec();
 
-  // The max reconnect attempts to tmaster for stream manager client
-  sp_int32 GetHeronStreammgrClientReconnectTmasterMaxAttempts();
+  // The max reconnect attempts to tmanager for stream manager client
+  sp_int32 GetHeronStreammgrClientReconnectTmanagerMaxAttempts();
 
   // The maximum packet size in MB of stream manager's network options
   sp_int32 GetHeronStreammgrNetworkOptionsMaximumPacketMb();
 
   // The interval in seconds to send heartbeat
-  sp_int32 GetHeronStreammgrTmasterHeartbeatIntervalSec();
+  sp_int32 GetHeronStreammgrTmanagerHeartbeatIntervalSec();
 
   // Maximum batch size in MB to read by stream manager from socket
   sp_int32 GetHeronStreammgrConnectionReadBatchSizeMb();