Support SSL Shuffle for LLAP

ganeshashree · Mar 21, 2024 · 7c8473b · 7c8473b
1 parent 20106e2
commit 7c8473b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/configuration/LlapDaemonConfiguration.java b/llap-server/src/java/org/apache/hadoop/hive/llap/configuration/LlapDaemonConfiguration.java
@@ -32,7 +32,7 @@ public class LlapDaemonConfiguration extends Configuration {
       "hdfs-site.xml", "yarn-site.xml", "tez-site.xml", "hive-site.xml" };
 
   @InterfaceAudience.Private
-  public static final String[] SSL_DAEMON_CONFIGS = { "ssl-client.xml" };
+  public static final String[] SSL_DAEMON_CONFIGS = { "ssl-server.xml", "ssl-client.xml"};
 
   public LlapDaemonConfiguration() {
     super(true); // Load the defaults.

diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/ShuffleHandler.java b/llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/ShuffleHandler.java
@@ -204,6 +204,9 @@ public class ShuffleHandler implements AttemptRegistrationListener {
 
   public static final String CONNECTION_CLOSE = "close";
 
+  public static final String SHUFFLE_SSL_ENABLED_KEY = "hive.llap.shuffle.ssl.enabled";
+  public static boolean SHUFFLE_SSL_ENABLED_DEFAULT = false;
+
   public static final String SUFFLE_SSL_FILE_BUFFER_SIZE_KEY =
     "llap.shuffle.ssl.file.buffer.size";
 
@@ -376,13 +379,12 @@ public void start() throws Exception {
 
   private void initPipeline(ServerBootstrap bootstrap, Configuration conf) throws Exception {
     SHUFFLE = getShuffle(conf);
-    // TODO Setup SSL Shuffle
-    //  if (conf.getBoolean(MRConfig.SHUFFLE_SSL_ENABLED_KEY,
-    //                      MRConfig.SHUFFLE_SSL_ENABLED_DEFAULT)) {
-    //    LOG.info("Encrypted shuffle is enabled.");
-    //    sslFactory = new SSLFactory(SSLFactory.Mode.SERVER, conf);
-    //    sslFactory.init();
-    //  }
+     // Setup SSL Shuffle
+      if (conf.getBoolean(SHUFFLE_SSL_ENABLED_KEY, SHUFFLE_SSL_ENABLED_DEFAULT)) {
+        LOG.info("Encrypted shuffle is enabled.");
+        sslFactory = new SSLFactory(SSLFactory.Mode.SERVER, conf);
+        sslFactory.init();
+      }
 
     ChannelInitializer<NioSocketChannel> channelInitializer =
         new ChannelInitializer<NioSocketChannel>() {