Merge pull request #444 from tulumvinh/3.x

Removal of yaml entries not applicable to Cassandra 2.1
Netflix · Mar 3, 2016 · ceeb809 · ceeb809
2 parents fa00d87 + 96e9052
commit ceeb809
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/priam/src/main/java/com/netflix/priam/defaultimpl/StandardTuner.java b/priam/src/main/java/com/netflix/priam/defaultimpl/StandardTuner.java
@@ -62,13 +62,20 @@ public void writeAllProperties(String yamlLocation, String hostname, String seed
         boolean enableIncremental = (config.getBackupHour() >= 0 && config.isIncrBackup()) && (CollectionUtils.isEmpty(config.getBackupRacs()) || config.getBackupRacs().contains(config.getRac()));
         map.put("incremental_backups", enableIncremental);
         map.put("endpoint_snitch", config.getSnitch());
-//        map.put("in_memory_compaction_limit_in_mb", config.getInMemoryCompactionLimit());
+        if (map.containsKey("in_memory_compaction_limit_in_mb")) {
+        	map.remove("in_memory_compaction_limit_in_mb");
+        }
         map.put("compaction_throughput_mb_per_sec", config.getCompactionThroughput());
         map.put("partitioner", derivePartitioner(map.get("partitioner").toString(), config.getPartitioner()));
 
-//        map.put("memtable_total_space_in_mb", config.getMemtableTotalSpaceMB());
+        if (map.containsKey("memtable_total_space_in_mb")) {
+        	map.remove("memtable_total_space_in_mb");
+        }
+
         map.put("stream_throughput_outbound_megabits_per_sec", config.getStreamingThroughputMB());
-//        map.put("multithreaded_compaction", config.getMultithreadedCompaction());
+        if (map.containsKey("multithreaded_compaction")) {
+        	map.remove("multithreaded_compaction");
+        }
 
         map.put("max_hint_window_in_ms", config.getMaxHintWindowInMS());
         map.put("hinted_handoff_throttle_in_kb", config.getHintedHandoffThrottleKb());