From 7af84d73212aab9161a7d99558b2555698102bab Mon Sep 17 00:00:00 2001 From: Megh Bhatt Date: Mon, 9 Nov 2015 13:48:57 -0800 Subject: [PATCH] Replace calls to nodetool repair directly from database nodemgr with contrail-cassandra-repair since it handles preventing multiple instances of nodetool repair per keyspace running concurrently. Closes-Bug: #1513658 Change-Id: I63c4a4123489eea2bf0597f8cc2c7dbc1ec4cb58 (cherry picked from commit 38c8f77bbd8328e0bc8f78d72241267120af9f27) --- src/nodemgr/database_event_manager.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/nodemgr/database_event_manager.py b/src/nodemgr/database_event_manager.py index 9c3c0609db5..206238e544c 100644 --- a/src/nodemgr/database_event_manager.py +++ b/src/nodemgr/database_event_manager.py @@ -27,8 +27,7 @@ from pysandesh.gen_py.sandesh_trace.ttypes import SandeshTraceRequest from sandesh_common.vns.ttypes import Module, NodeType from sandesh_common.vns.constants import ModuleNames, NodeTypeNames,\ - Module2NodeType, INSTANCE_ID_DEFAULT, SERVICE_CONTRAIL_DATABASE, \ - RepairNeededKeyspaces + Module2NodeType, INSTANCE_ID_DEFAULT, SERVICE_CONTRAIL_DATABASE from subprocess import Popen, PIPE from StringIO import StringIO @@ -203,11 +202,9 @@ def database_periodic(self): # end database_periodic def cassandra_repair(self): - for keyspace in RepairNeededKeyspaces: - repair_file_name = '/var/log/cassandra/repair-' + keyspace + '.log' - with open(repair_file_name, "a") as repair_file: - subprocess.Popen(["nodetool", "repair", "-pr", keyspace], - stdout=repair_file, stderr=repair_file) + subprocess.Popen(["contrail-cassandra-repair", + "--log-file", "/var/log/cassandra/repair.log", + "--debug"]) #end cassandra_repair def send_disk_usage_info(self):