Closes-Bug: #1573841

in cassandra-env.sh, when comparing JVM_PATCH_VERSION, currently string cmp is used which shows "101" < "25", hence changing the comparison to -lt cmp Change-Id: I21b920fa4115cdbe1483a3bd2e001ba6c62c6649
Juniper · May 4, 2016 · b5a8ca3 · b5a8ca3
1 parent 04da274
commit b5a8ca3
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/contrail_provisioning/database/setup.py b/contrail_provisioning/database/setup.py
@@ -192,6 +192,9 @@ def fixup_cassandra_config_files(self):
               % (env_file))
         local("sudo sed -i 's/# JVM_OPTS=\"\$JVM_OPTS -Xloggc:\/var\/log\/cassandra\/gc-`date +%%s`.log\"/JVM_OPTS=\"\$JVM_OPTS -Xloggc:\/var\/log\/cassandra\/gc-`date +%%s`.log\"/g' %s" \
               % (env_file))
+        # change < to -lt for numeric comparison
+        local("sudo sed -i 's/if \\[ \\\"\\$JVM_VERSION\\\" \\\\< \\\"1.8\\\" \\] && \\[ \\\"\\$JVM_PATCH_VERSION\\\" \\\\< \\\"25\\\" \\] ; \
+then/if [ \"\\$JVM_VERSION\" \\\\< \"1.8\" ] \\&\\& [ \"\\$JVM_PATCH_VERSION\" -lt \"25\" ] ; then/g' %s" % (env_file))
         local("sudo sed -i 's/MaxTenuringThreshold=.*\"/MaxTenuringThreshold=30\"/g' %s" % (env_file))
 
     def fixup_config_files(self):