From 3378c9a2f010e79a6e66eca0f1178681f9b79e0e Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Fri, 30 Jun 2017 16:08:11 +0200
Subject: [PATCH] Revert "F #4809: Log information to debug federated zones
 with HA clusters. THIS"

This reverts commit fab2a07f74f55528631fa5b6159e80c1fa884637.
---
 src/raft/FedReplicaManager.cc | 35 +----------------------------------
 src/rm/RequestManagerZone.cc  |  7 -------
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/src/raft/FedReplicaManager.cc b/src/raft/FedReplicaManager.cc
index b2d5f7bbf5..ecb7f7f170 100644
--- a/src/raft/FedReplicaManager.cc
+++ b/src/raft/FedReplicaManager.cc
@@ -290,23 +290,11 @@ int FedReplicaManager::get_next_record(int zone_id, std::string& zedp,
 
     zedp  = zs->endpoint;
 
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-    std::ostringstream loss;
-    loss << "REPLICATE FOR ZONE: " << zone_id << " NEXT IS: " << zs->next
-         << "LAST IS: " << zs->last;
-    NebulaLog::log("ReM", Log::INFO, loss);
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
     if ( zs->next == -1 )
     {
         zs->next= logdb->last_federated();
     }
 
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-    loss.str("");
-    loss << "REPLICATE FOR ZONE: " << zone_id << " NEXT IS: " << zs->next
-         << "LAST IS: " << zs->last;
-    NebulaLog::log("ReM", Log::INFO, loss);
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
     if ( zs->last == zs->next )
     {
         pthread_mutex_unlock(&mutex);
@@ -337,19 +325,10 @@ void FedReplicaManager::replicate_success(int zone_id)
 
     ZoneServers * zs = it->second;
 
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-    std::ostringstream loss;
-    loss << "SUCCESS REPLICATE FOR ZONE: " << zone_id << " NEXT: " << zs->next
-         << " LAST: " << zs->last;
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
     zs->last = zs->next;
 
     zs->next = logdb->next_federated(zs->next);
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-    loss.str("");
-    loss << " NEW NEXT: " << zs->next << " NEW LAST: " << zs->last;
-    NebulaLog::log("ReM", Log::INFO, loss);
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+
     if ( zs->next != -1 )
     {
         ReplicaManager::replicate(zone_id);
@@ -377,12 +356,6 @@ void FedReplicaManager::replicate_failure(int zone_id, int last_zone)
             zs->next = logdb->next_federated(zs->last);
         }
 
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-    std::ostringstream loss;
-    loss << "FAILURE REPLICATE FOR ZONE: " << zone_id << " NEXT: " << zs->next
-         << "LAST: " << zs->last << " LAST_ZONE: " << last_zone;
-    NebulaLog::log("ReM", Log::INFO, loss);
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
         if ( zs->next != -1 )
         {
             ReplicaManager::replicate(zone_id);
@@ -431,12 +404,6 @@ int FedReplicaManager::xmlrpc_replicate_log(int zone_id, bool& success,
     replica_params.add(xmlrpc_c::value_int(prev_index));
     replica_params.add(xmlrpc_c::value_string(lr.sql));
 
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-    std::ostringstream loss;
-    loss << "REPLICATING INDEX: " <<lr.index<< " PREV_INDEX: " << prev_index
-         << " SQL: " <<lr.sql;
-    NebulaLog::log("ReM", Log::INFO, loss);
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
     // -------------------------------------------------------------------------
     // Do the XML-RPC call
     // -------------------------------------------------------------------------
diff --git a/src/rm/RequestManagerZone.cc b/src/rm/RequestManagerZone.cc
index b733cea660..8c054dfa89 100644
--- a/src/rm/RequestManagerZone.cc
+++ b/src/rm/RequestManagerZone.cc
@@ -522,13 +522,6 @@ void ZoneReplicateFedLog::request_execute(xmlrpc_c::paramList const& paramList,
     int prev   = xmlrpc_c::value_int(paramList.getInt(2));
     string sql = xmlrpc_c::value_string(paramList.getString(3));
 
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-    std::ostringstream loss;
-    loss << "REPLICATE REQUEST INDEX: " << index << " PREV: " << prev << " SQL: " 
-         << sql;
-    NebulaLog::log("ReM", Log::INFO, loss);
-//LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-
     if ( att.uid != 0 )
     {
         att.resp_id  = -1;