Remove PrestoClusterManager

trinodb · Jun 8, 2020 · 0f9c1e4 · 0f9c1e4
1 parent 0afa8be
commit 0f9c1e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 119 deletions.
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/rubix/PrestoClusterManager.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/rubix/PrestoClusterManager.java
diff --git a/presto-hive/src/main/java/io/prestosql/plugin/hive/rubix/RubixInitializer.java b/presto-hive/src/main/java/io/prestosql/plugin/hive/rubix/RubixInitializer.java
@@ -27,6 +27,7 @@
 import com.qubole.rubix.prestosql.CachingPrestoS3FileSystem;
 import com.qubole.rubix.prestosql.CachingPrestoSecureAzureBlobFileSystem;
 import com.qubole.rubix.prestosql.CachingPrestoSecureNativeAzureFileSystem;
+import com.qubole.rubix.prestosql.PrestoClusterManager;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
 import io.prestosql.plugin.base.CatalogName;
@@ -60,7 +61,6 @@
 import static com.qubole.rubix.spi.CacheConfig.setEmbeddedMode;
 import static com.qubole.rubix.spi.CacheConfig.setIsParallelWarmupEnabled;
 import static com.qubole.rubix.spi.CacheConfig.setOnMaster;
-import static com.qubole.rubix.spi.CacheConfig.setPrestoClusterManager;
 import static io.prestosql.plugin.hive.DynamicConfigurationProvider.setCacheKey;
 import static io.prestosql.plugin.hive.util.ConfigurationUtils.getInitialConfiguration;
 import static io.prestosql.plugin.hive.util.RetryDriver.DEFAULT_SCALE_FACTOR;
@@ -232,6 +232,7 @@ private void startRubix()
         LocalDataTransferServer.startServer(configuration, metricRegistry, bookKeeper);
 
         CachingFileSystem.setLocalBookKeeper(bookKeeper, "catalog=" + catalogName);
+        PrestoClusterManager.setNodeManager(nodeManager);
         log.info("Rubix initialized successfully");
         cacheReady = true;
     }
@@ -241,6 +242,7 @@ private void setupRubixMetrics()
         Configuration configuration = getRubixServerConfiguration();
         new BookKeeperServer().setupServer(configuration, new MetricRegistry());
         CachingFileSystem.setLocalBookKeeper(null, "catalog=" + catalogName);
+        PrestoClusterManager.setNodeManager(nodeManager);
     }
 
     private Configuration getRubixServerConfiguration()
@@ -288,10 +290,6 @@ void updateRubixConfiguration(Configuration config)
 
         config.set("fs.hdfs.impl", RUBIX_DISTRIBUTED_FS_CLASS_NAME);
 
-        // TODO: fix PrestoClusterManager in Rubix itself
-        PrestoClusterManager.setNodeManager(nodeManager);
-        setPrestoClusterManager(config, PrestoClusterManager.class.getName());
-
         extraConfigInitializer.ifPresent(initializer -> initializer.initializeConfiguration(config));
     }
 }