Make SSL port configurable by Priam and use the same for configuration.

zznate · May 31, 2012 · b759ee7 · b759ee7
1 parent 1f1f4b5
commit b759ee7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/src/main/java/com/netflix/priam/IConfiguration.java b/src/main/java/com/netflix/priam/IConfiguration.java
@@ -103,6 +103,8 @@ public interface IConfiguration
      * @return
      */
     public int getStoragePort();
+
+    public int getSSLStoragePort();
 
     /**
      * @return Cassandra's thrift port

diff --git a/src/main/java/com/netflix/priam/aws/UpdateSecuritySettings.java b/src/main/java/com/netflix/priam/aws/UpdateSecuritySettings.java
@@ -69,7 +69,7 @@ public void execute()
         }
         if (add.size() > 0)
         {
-            int port = config.getStoragePort();
+            int port = config.getSSLStoragePort();
             membership.addACL(add, port, port);
             firstTimeUpdated = true;
         }
@@ -89,7 +89,7 @@ public void execute()
                 remove.add(acl);
         if (remove.size() > 0)
         {
-            int port = config.getStoragePort(); 
+            int port = config.getSSLStoragePort(); 
             membership.removeACL(remove, port, port);
             firstTimeUpdated = true;
         }

diff --git a/src/main/java/com/netflix/priam/defaultimpl/PriamConfiguration.java b/src/main/java/com/netflix/priam/defaultimpl/PriamConfiguration.java
@@ -53,6 +53,7 @@ public class PriamConfiguration implements IConfiguration
     private static final String CONFIG_DIRECT_MAX_HEAP_SIZE = PRIAM_PRE + ".direct.memory.size.";
     private static final String CONFIG_THRIFT_LISTERN_PORT_NAME = PRIAM_PRE + ".thrift.port";
     private static final String CONFIG_STORAGE_LISTERN_PORT_NAME = PRIAM_PRE + ".storage.port";
+    private static final String CONFIG_SSL_STORAGE_LISTERN_PORT_NAME = PRIAM_PRE + ".ssl.storage.port";
     private static final String CONFIG_CL_BK_LOCATION = PRIAM_PRE + ".backup.commitlog.location";
     private static final String CONFIG_THROTTLE_UPLOAD_PER_SECOND = PRIAM_PRE + ".upload.throttle";
     private static final String CONFIG_IN_MEMORY_COMPACTION_LIMIT = PRIAM_PRE + ".memory.compaction.limit";
@@ -113,7 +114,8 @@ public class PriamConfiguration implements IConfiguration
     private final String DEFAULT_MAX_NEWGEN_HEAP = "2G";
     private final int DEFAULT_JMX_PORT = 7199;
     private final int DEFAULT_THRIFT_PORT = 9160;
-    private final int DEFAULT_STORAGE_PORT = 7000;
+    private final int DEFAULT_STORAGE_PORT = 7101;
+    private final int DEFAULT_SSL_STORAGE_PORT = 7101;
     private final int DEFAULT_BACKUP_HOUR = 12;
     private final int DEFAULT_BACKUP_THREADS = 2;
     private final int DEFAULT_RESTORE_THREADS = 8;
@@ -367,6 +369,12 @@ public int getStoragePort()
         return config.getInteger(CONFIG_STORAGE_LISTERN_PORT_NAME, DEFAULT_STORAGE_PORT);
     }
 
+    @Override
+    public int getSSLStoragePort()
+    {
+        return config.getInteger(CONFIG_SSL_STORAGE_LISTERN_PORT_NAME, DEFAULT_SSL_STORAGE_PORT);
+    }
+
     @Override
     public String getSnitch()
     {

diff --git a/src/main/java/com/netflix/priam/utils/TuneCassandra.java b/src/main/java/com/netflix/priam/utils/TuneCassandra.java
@@ -49,10 +49,11 @@ public static void updateYaml(IConfiguration config, String yamlLocation, String
         Map map = (Map) yaml.load(new FileInputStream(yamlFile));
         map.put("cluster_name", config.getAppName());
         map.put("storage_port", config.getStoragePort());
+        map.put("ssl_storage_port", config.getSSLStoragePort());
         map.put("rpc_port", config.getThriftPort());
         map.put("listen_address", hostname);
         map.put("rpc_address", hostname);
-        //Dont bootstrap in restore mode        
+        //Dont bootstrap in restore mode
         map.put("auto_bootstrap", !Restore.isRestoreEnabled(config));
         map.put("saved_caches_directory", config.getCacheLocation());
         map.put("commitlog_directory", config.getCommitLogLocation());

diff --git a/src/test/java/com/netflix/priam/FakeConfiguration.java b/src/test/java/com/netflix/priam/FakeConfiguration.java
@@ -307,7 +307,7 @@ public String getCassStopScript()
     @Override
     public int getStoragePort()
     {
-        return 7000;
+        return 7101;
     }
 
     @Override
@@ -358,4 +358,11 @@ public boolean getMultithreadedCompaction()
         return false;
     }
 
+    @Override
+    public int getSSLStoragePort()
+    {
+        // TODO Auto-generated method stub
+        return 7103;
+    }
+
 }