From 94dd70d733786a4d81cf2ee6ee8e5efc7f60b9c1 Mon Sep 17 00:00:00 2001 From: Raj Reddy Date: Tue, 3 May 2016 22:33:47 -0700 Subject: [PATCH] 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 (cherry picked from commit b5a8ca3f452ad7e76c479fe4955d5c41c2d86e12) --- contrail_provisioning/database/setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrail_provisioning/database/setup.py b/contrail_provisioning/database/setup.py index d1f9e040..bda72598 100755 --- a/contrail_provisioning/database/setup.py +++ b/contrail_provisioning/database/setup.py @@ -193,6 +193,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):