From 09484dd10bba52e2bc2c7bc2ce742e4a8e58a8be Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 10 Mar 2016 08:40:41 +0000
Subject: [PATCH] Added MonitorData class to simplify writing monitored objects
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 8b7e26a..46795c3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -23,7 +23,6 @@
import static org.opends.server.protocols.internal.Requests.*;
import static org.opends.server.replication.plugin.EntryHistorical.*;
import static org.opends.server.replication.protocol.OperationContext.*;
-import static org.opends.server.replication.service.ReplicationMonitor.*;
import static org.opends.server.util.CollectionUtils.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -80,6 +79,7 @@
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.api.BackendInitializationListener;
import org.opends.server.api.DirectoryThread;
+import org.opends.server.api.MonitorData;
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.backends.task.Task;
@@ -4282,28 +4282,17 @@
return true;
}
- /**
- * Monitoring information for the LDAPReplicationDomain.
- *
- * @return Monitoring attributes specific to the LDAPReplicationDomain.
- */
@Override
- public Collection<Attribute> getAdditionalMonitoring()
+ public void addAdditionalMonitoring(MonitorData attributes)
{
- List<Attribute> attributes = new ArrayList<>();
-
- // number of updates in the pending list
- addMonitorData(attributes, "pending-updates", pendingChanges.size());
-
- addMonitorData(attributes, "replayed-updates-ok", numReplayedPostOpCalled.get());
- addMonitorData(attributes, "resolved-modify-conflicts", numResolvedModifyConflicts.get());
- addMonitorData(attributes, "resolved-naming-conflicts", numResolvedNamingConflicts.get());
- addMonitorData(attributes, "unresolved-naming-conflicts", numUnresolvedNamingConflicts.get());
- addMonitorData(attributes, "remote-pending-changes-size", remotePendingChanges.getQueueSize());
- addMonitorData(attributes, "dependent-changes-size", remotePendingChanges.getDependentChangesSize());
- addMonitorData(attributes, "changes-in-progress-size", remotePendingChanges.changesInProgressSize());
-
- return attributes;
+ attributes.add("pending-updates", pendingChanges.size());
+ attributes.add("replayed-updates-ok", numReplayedPostOpCalled);
+ attributes.add("resolved-modify-conflicts", numResolvedModifyConflicts);
+ attributes.add("resolved-naming-conflicts", numResolvedNamingConflicts);
+ attributes.add("unresolved-naming-conflicts", numUnresolvedNamingConflicts);
+ attributes.add("remote-pending-changes-size", remotePendingChanges.getQueueSize());
+ attributes.add("dependent-changes-size", remotePendingChanges.getDependentChangesSize());
+ attributes.add("changes-in-progress-size", remotePendingChanges.changesInProgressSize());
}
/**
--
Gitblit v1.10.0