Kanagaraj M has uploaded a new change for review. Change subject: engine: improve logging in gluster sync job ......................................................................
engine: improve logging in gluster sync job Added more information to logging while refreshing the servers list in a gluster cluster. Change-Id: Ie07ba4447366915e0a9d487d241ea1ae9927a196 Signed-off-by: Kanagaraj M <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJob.java 1 file changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/16712/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJob.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJob.java index b4b9b3c..3ef09e2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJob.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJob.java @@ -99,7 +99,6 @@ log.debugFormat("No server UP in cluster {0}. Can't refresh it's data at this point.", cluster.getName()); return; } - refreshServerData(cluster, upServer, existingServers); refreshVolumeData(cluster, upServer, existingServers); } @@ -125,6 +124,10 @@ } acquireLock(cluster.getId()); + + log.infoFormat("Refreshing Gluster Server data for cluster {0} using server {1} ", + cluster.getName(), + upServer.getName()); try { List<GlusterServerInfo> fetchedServers = fetchServers(cluster, upServer, existingServers); if (fetchedServers != null) { @@ -138,19 +141,25 @@ } private void removeDetachedServers(List<VDS> existingServers, List<GlusterServerInfo> fetchedServers) { + boolean serverRemoved = false; for (VDS server : existingServers) { if (isRemovableStatus(server.getStatus()) && serverDetached(server, fetchedServers)) { - log.debugFormat("Server {0} has been removed directly using the gluster CLI. Removing it from engine as well.", + log.infoFormat("Server {0} has been removed directly using the gluster CLI. Removing it from engine as well.", server.getName()); logUtil.logServerMessage(server, AuditLogType.GLUSTER_SERVER_REMOVED_FROM_CLI); try { removeServerFromDb(server); // remove the server from resource manager runVdsCommand(VDSCommandType.RemoveVds, new RemoveVdsVDSCommandParameters(server.getId())); + serverRemoved = true; } catch (Exception e) { log.errorFormat("Error while removing server {0} from database!", server.getName(), e); } } + } + if (serverRemoved) { + log.infoFormat("Servers detached using gluster CLI is removed from engine after inspecting the Gluster servers list {0}", + fetchedServers); } } @@ -238,6 +247,7 @@ } if (fetchedServers.size() == 1 && existingServers.size() > 2) { + log.infoFormat("Gluster servers list fetched from server {0} has only one server", upServer.getName()); // It's possible that the server we are using to get list of servers itself has been removed from the // cluster, and hence is returning a single server (itself) GlusterServerInfo server = fetchedServers.iterator().next(); @@ -286,8 +296,11 @@ private List<GlusterServerInfo> fetchServers(VDS upServer, List<VDS> existingServers) { List<GlusterServerInfo> fetchedServers = null; while (fetchedServers == null && !existingServers.isEmpty()) { + log.infoFormat("Fetching gluster servers list from server {0}", upServer.getName()); fetchedServers = fetchServers(upServer); if (fetchedServers == null) { + log.infoFormat("Gluster servers list failed in server {0} moving it to NonOperational", + upServer.getName()); logUtil.logServerMessage(upServer, AuditLogType.GLUSTER_SERVERS_LIST_FAILED); // Couldn't fetch servers from the up server. Mark it as non-operational setNonOperational(upServer); @@ -302,7 +315,7 @@ SetNonOperationalVdsParameters nonOpParams = new SetNonOperationalVdsParameters(server.getId(), NonOperationalReason.GLUSTER_COMMAND_FAILED, - Collections.singletonMap(GlusterConstants.COMMAND, "gluster peer probe")); + Collections.singletonMap(GlusterConstants.COMMAND, "gluster peer status")); nonOpParams.setSaveToDb(true); Backend.getInstance().runInternalAction(VdcActionType.SetNonOperationalVds, nonOpParams, -- To view, visit http://gerrit.ovirt.org/16712 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie07ba4447366915e0a9d487d241ea1ae9927a196 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
