From 1b310665190694ca3e21f53e0a661ee1de31d2a0 Mon Sep 17 00:00:00 2001
From: mrossign <mrossign@localhost>
Date: Thu, 15 Jan 2009 13:45:52 +0000
Subject: [PATCH] - Added assured replication monitoring in replication server - Assured replication monitoring attributes in directory server have consistent names - Some existing monitoring attributes renamed in replication server to be consistent with directory server existing ones
---
opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
index 348112f..b51cbd1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/service/ReplicationDomain.java
@@ -226,7 +226,7 @@
/**
* A set of counters used for Monitoring.
*/
- private AtomicInteger numProcessedUpdates = new AtomicInteger();
+ private AtomicInteger numProcessedUpdates = new AtomicInteger(0);
private AtomicInteger numRcvdUpdates = new AtomicInteger(0);
private AtomicInteger numSentUpdates = new AtomicInteger(0);
@@ -258,13 +258,13 @@
private Map<Short,Integer> assuredSrServerNotAcknowledgedUpdates =
new HashMap<Short,Integer>();
// Number of updates received in Assured Mode, Safe Read request
- private AtomicInteger receivedAssuredSrUpdates = new AtomicInteger(0);
+ private AtomicInteger assuredSrReceivedUpdates = new AtomicInteger(0);
// Number of updates received in Assured Mode, Safe Read request that we have
// acked without errors
- private AtomicInteger receivedAssuredSrUpdatesAcked = new AtomicInteger(0);
+ private AtomicInteger assuredSrReceivedUpdatesAcked = new AtomicInteger(0);
// Number of updates received in Assured Mode, Safe Read request that we have
// acked with errors
- private AtomicInteger receivedAssuredSrUpdatesNotAcked = new AtomicInteger(0);
+ private AtomicInteger assuredSrReceivedUpdatesNotAcked = new AtomicInteger(0);
// Number of updates sent in Assured Mode, Safe Data
private AtomicInteger assuredSdSentUpdates = new AtomicInteger(0);
// Number of updates sent in Assured Mode, Safe Data, that have been
@@ -800,7 +800,7 @@
if ( update.isAssured() && (update.getAssuredMode() ==
AssuredMode.SAFE_READ_MODE) && (rsGroupId == groupId) )
{
- receivedAssuredSrUpdates.incrementAndGet();
+ assuredSrReceivedUpdates.incrementAndGet();
}
return update;
}
@@ -1632,12 +1632,14 @@
if (newStatus != status)
{
+ // Reset status date
+ lastStatusChangeDate = new Date();
+ // Reset monitoring counters if reconnection
+ if (newStatus == ServerStatus.NOT_CONNECTED_STATUS)
+ resetMonitoringCounters();
+
// Store new status
status = newStatus;
- lastStatusChangeDate = new Date();
- // Reset assured monitoring counters (they are valid for a session with
- // the same status/RS)
- resetAssuredMonitoringCounters();
if (debugEnabled())
TRACER.debugInfo("Replication domain " + serviceID +
@@ -2035,9 +2037,9 @@
* Gets the number of updates received in assured safe read mode request.
* @return The number of updates received in assured safe read mode request.
*/
- public int getReceivedAssuredSrUpdates()
+ public int getAssuredSrReceivedUpdates()
{
- return receivedAssuredSrUpdates.get();
+ return assuredSrReceivedUpdates.get();
}
/**
@@ -2046,9 +2048,9 @@
* @return The number of updates received in assured safe read mode that we
* acked without error (no replay error).
*/
- public int getReceivedAssuredSrUpdatesAcked()
+ public int getAssuredSrReceivedUpdatesAcked()
{
- return this.receivedAssuredSrUpdatesAcked.get();
+ return this.assuredSrReceivedUpdatesAcked.get();
}
/**
@@ -2057,9 +2059,9 @@
* @return The number of updates received in assured safe read mode that we
* did not ack due to error (replay error).
*/
- public int getReceivedAssuredSrUpdatesNotAcked()
+ public int getAssuredSrReceivedUpdatesNotAcked()
{
- return this.receivedAssuredSrUpdatesNotAcked.get();
+ return this.assuredSrReceivedUpdatesNotAcked.get();
}
/**
@@ -2126,10 +2128,14 @@
}
/**
- * Resets the values of the monitoring counters for assured replication.
+ * Resets the values of the monitoring counters.
*/
- private void resetAssuredMonitoringCounters()
+ private void resetMonitoringCounters()
{
+ numProcessedUpdates = new AtomicInteger(0);
+ numRcvdUpdates = new AtomicInteger(0);
+ numSentUpdates = new AtomicInteger(0);
+
assuredSrSentUpdates = new AtomicInteger(0);
assuredSrAcknowledgedUpdates = new AtomicInteger(0);
assuredSrNotAcknowledgedUpdates = new AtomicInteger(0);
@@ -2137,9 +2143,9 @@
assuredSrWrongStatusUpdates = new AtomicInteger(0);
assuredSrReplayErrorUpdates = new AtomicInteger(0);
assuredSrServerNotAcknowledgedUpdates = new HashMap<Short,Integer>();
- receivedAssuredSrUpdates = new AtomicInteger(0);
- receivedAssuredSrUpdatesAcked = new AtomicInteger(0);
- receivedAssuredSrUpdatesNotAcked = new AtomicInteger(0);
+ assuredSrReceivedUpdates = new AtomicInteger(0);
+ assuredSrReceivedUpdatesAcked = new AtomicInteger(0);
+ assuredSrReceivedUpdatesNotAcked = new AtomicInteger(0);
assuredSdSentUpdates = new AtomicInteger(0);
assuredSdAcknowledgedUpdates = new AtomicInteger(0);
assuredSdTimeoutUpdates = new AtomicInteger(0);
@@ -2405,10 +2411,10 @@
broker.publish(ackMsg);
if (replayErrorMsg != null)
{
- receivedAssuredSrUpdatesNotAcked.incrementAndGet();
+ assuredSrReceivedUpdatesNotAcked.incrementAndGet();
} else
{
- receivedAssuredSrUpdatesAcked.incrementAndGet();
+ assuredSrReceivedUpdatesAcked.incrementAndGet();
}
}
} else if (assuredMode != AssuredMode.SAFE_DATA_MODE)
--
Gitblit v1.10.0