10 Oct, 2013
5 commits
-
DBCursor.java: Added usage example to the javadocs. DraftCNDB.java: Replaced catch (Exception) by catch (DatabaseException), or removed them altogether where unapplicable. In next(), first wiped the current record + reverted the if condition and clauses. git-svn-id: https://svn.forgerock.org/opendj/trunk@9704 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Changes after review from Matthew Swift. Renamed CNIndexRecord to ChangeNumberIndexRecord to be consistent with ChangeNumberIndexDB name. git-svn-id: https://svn.forgerock.org/opendj/trunk@9703 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Removed ChangeNumberIndexDB.getRecord(long). ECLServerHandler.java: Replaced calls to ChangeNumberIndexDB.getRecord() by calls to ChangeNumberIndexDB.getCursorFrom(). Inlined all the crossDomainStartState local variables. Added getCursorFrom() to preserve old behaviour from JEChangeNumberIndexDBCursor ctor. ChangeNumberIndexDB.java: Removed getRecord(). JEChangeNumberIndexDB.java: Removed getReadCursor(), getRecord() + some surprising and never used code like lock field, hasLock(), lock() and release(). JEChangeNumberIndexDBCursor.java: In ctor, do not throw ChangelogException if the changeNumber cannot be found. JEChangeNumberIndexDBTest.java: Used JEChangeNumberIndexDB.getCursorFrom() instead of JEChangeNumberIndexDB.getReadCursor(). Renamed a few variables. git-svn-id: https://svn.forgerock.org/opendj/trunk@9702 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Changes after review from Matthew Swift. Consolidated ChangeNumberIndexDBCursor and ReplicaDBCursor into a single interface named DBCursor. DBCursor.java: ADDED It does not implement Comparable like ReplicaDBCursor. Instead a Comparator has been extracted to JEChangelogDB.CrossReplicaDBCursor . ChangeNumberIndexDBCursor.java, ReplicaDBCursor.java: DELETED - replaced by DBCursor *.java: Used DBCursor instead of removed cursor interfaces. git-svn-id: https://svn.forgerock.org/opendj/trunk@9699 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Here is the failure scenario for this test (with one CPU): t1 (test thread) t2 (CNIndexDB purge thread) ---------------- --------------------------- | | | v | JEChangeNumberIndexDB | run() | trim() | clear(null) <- entered, but not completed v ChangeNumberIndexDB setPurgeDelay(0); addRecord(1) addRecord(2) addRecord(3) | | | +--> executes the clear() v getFirstRecord() <- BOOM NullPointerException! Ensured the CNIndexDB is not trimmed until we explicitly test it: to do this, ensured the thread is only started when needed by the test. Also took the occasion to ensure a faster shutdown for the CNIndexDB trimming thread. JEChangeNumberIndexDB.java: Ensured we use volatile and AtomicBoolean. Renamed thread field to trimmingThread. Extracted method startTrimmingThread(). In trim(), added an AtomicBoolean parameter. Added methods clear(DN, AtomicBoolean shutdown) and mustShutdown() to ensure faster shutdown. JEChangelogDB.java: Called JEChangeNumberIndexDB.startTrimmingThread() after creating the JEChangeNumberIndexDB instance. JEChangeNumberIndexDBTest.java: Extracted constants. In testTrim(), called JEChangeNumberIndexDB.startTrimmingThread(). In testClear(), removed git-svn-id: https://svn.forgerock.org/opendj/trunk@9698 41b1ffd8-f28e-4786-ab96-9950f0a78031
09 Oct, 2013
6 commits
-
Improved javadocs. git-svn-id: https://svn.forgerock.org/opendj/trunk@9696 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Change after review from Matthew Swift. ReplicaDBCursor.java: In next(), added thrown ChangelogException. ReplicaDBCursor.java, JEChangelogDB.java: In next(), let ChangelogException go up. *.java: Consequence of the change to ReplicaDBCursor. git-svn-id: https://svn.forgerock.org/opendj/trunk@9695 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Partially reverted r9691 which was: "In getECLChangeNumberLimits(), brought the database empty code to the top of the method: to get something more readable." This code is more complex than I thought. git-svn-id: https://svn.forgerock.org/opendj/trunk@9693 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
ReplicationServerDomain.java: Renamed getStartState() to getOldestState(). ServerState.java: In duplicateOnlyOlderThan(), changed parameter from CSN to long. ReplicationServer.java: Consequence of the change to ServerState and ReplicationServerDomain. In getECLChangeNumberLimits(), brought the database empty code to the top of the method: to get something more readable. ECLServerHandler.java: Consequence of the change to ServerState and ReplicationServerDomain. Changed a few names / comments. JEChangeNumberIndexDB.java Consequence of the change to ReplicationServerDomain. ExternalChangeLogTest.java Consequence of the change to ReplicationServerDomain. Code cleanup: - removed gblCSN instance field - inlined sleep() - used connection.process*() + inlined runModifyOperation() and runDeleteOperation(). - renamed getReplicationDomainStartState() to getDomainOldestState() + added better asserts git-svn-id: https://svn.forgerock.org/opendj/trunk@9691 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
JEChangeNumberIndexDBTest.java: Fixed the build. ChangeNumberIndexDB.java, JEChangeNumberIndexDB.java: Improved the javadocs. Made instance variables volatile. *.java: First => Oldest Last => Newest git-svn-id: https://svn.forgerock.org/opendj/trunk@9690 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Changes after review from Matthew Swift. ChangeNumberIndexDB.java: In addRecord(), added a precision to the javadoc. ReplicationDomainDB.java In getDomainLatestTrimDate(), added a precision to the javadoc. Added replicaHeartbeat() and replicaOffline(). JEChangelogDB.java: Added empty implementation for replicaHeartbeat() and replicaOffline(). git-svn-id: https://svn.forgerock.org/opendj/trunk@9689 41b1ffd8-f28e-4786-ab96-9950f0a78031
08 Oct, 2013
7 commits
-
Changes after review from Matthew Swift. Hid ChangeNumberIndexDB.nextChangeNumber() from client code. ChangeNumberIndexDB.java, JEChangeNumberIndexDB.java: Removed nextChangeNumber(). Changed addRecord() to return the assigned changeNumber. ECLServerHandler.java, CNIndexRecord.java: Consequence of the change above. git-svn-id: https://svn.forgerock.org/opendj/trunk@9685 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Leveraged the ReplicaDBCursor interface to hide iterations cross replica DBs from client code. Net benefit: more coherent code + reduced coupling between changelogDB and ECL code. There is an added benefit: searching on cn=changelog now returns changes in order. The change was implemented by moving code from MessageHandler to JEChangelogDB. MessageHandler.java: Removed nextOldestUpdateMsg(), addCursorIfNotEmpty() and collectAllCursorsWithChanges(). Extracted method isLateQueueBelowThreshold(). ReplicationServerDomain.java Removed getServerIds() and getCursorFrom(int, CSN) Added getCursorFrom(CSN) and getCursorFrom(ServerState). ReplicationDomainDB.java: Removed getDomainServerIds() and getCursorFrom(DN, int, CSN) Added getCursorFrom(DN, CSN) and getCursorFrom(DN, ServerState). JEChangelogDB.java Added inenr class CrossReplicaDBCursor + moved getCursorFrom(DN, int, CSN) here from enclosing type. Removed getDomainServerIds(). Added getCursorFrom(DN, CSN) and getCursorFrom(DN, ServerState). ReplicationBackend.java: In writeChangesAfterCSN(), removed loop on the serverIds + renamed "rsd" to "rsDomain". JEReplicaDB.java, JEReplicaDBCursor.java: Implemented toString(). git-svn-id: https://svn.forgerock.org/opendj/trunk@9682 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
git-svn-id: https://svn.forgerock.org/opendj/trunk@9681 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
MultiDomainServerState.java In update() removed the call to ServerState.duplicate() and let client code decide whether it needs to call it. In toString(), use dSTringBuilder. Code cleanup, removed use of "this" and useless parentheses. ReplicationServer.java: In getLastECLCookie(), made the code more efficient: called ReplicationServerDomain.getLatestServerState() only if the baseDN is not excluded. ECLServerHandler.java: In buildDomainContexts(), Call ServerState.duplicate() before calling MultiDomainServerState.update(). git-svn-id: https://svn.forgerock.org/opendj/trunk@9680 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Extracted methods isMsgQueueAboveThreshold() and isMsgQueueBelowThreshold(). Extracted MsgQueue.consumeUpTo(UpdateMsg). Updated javadocs. MsgQueue.java: Added method consumeUpTo(UpdateMsg). git-svn-id: https://svn.forgerock.org/opendj/trunk@9679 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Tightening up the interfaces after review from Matthew Swift CNIndexRecord.java: Now final, removed a useless call to super(). ChangeNumberIndexDB.java, JEChangeNumberIndexDB.java: Removed methods from the interface that ought not to be exposed to clients but remain internal to the implementation. Moved javadocs to the implementation. JEChangelogDB.java: Reference JEChangeNumberIndexDB instead of ChangeNumberIndexDB due to the change above. git-svn-id: https://svn.forgerock.org/opendj/trunk@9678 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
ECLServerHandler.java: Renamed clDomCtxtsToString() to domaimCtxtsToString(). In waitAndProcessStartSessionECLFromRemoteServer(), removed the many declared exceptions. Extracted method buildDomainContexts(). Renamed findOldestChangeFromDomainCtxts() to findDomainCtxtWithOldestChange(). Removed useless comments git-svn-id: https://svn.forgerock.org/opendj/trunk@9677 41b1ffd8-f28e-4786-ab96-9950f0a78031
07 Oct, 2013
6 commits
-
Renamed "rsd" variable and field to "domain" and "rsDomain". git-svn-id: https://svn.forgerock.org/opendj/trunk@9675 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
ECLServerHandler.java: In getNextMessage(), forgot to revert one condition. Changed domainCtxts from DomainContext[] to Set<DomainContext>. git-svn-id: https://svn.forgerock.org/opendj/trunk@9674 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
ECLServerHandler.java: Moved fields to the top of the file. Extracted method asDate(), toString(CSN), isEligible(), debugInfo(), getNextMessage(), newECLUpdateMsg(). Renamed getNextEligibleMessageForDomain() to computeNextEligibleMessageForDomain(). Renamed initializeCLSearchFromGenState() to initializeCLSearchFromCookie(). In initializeChangelogDomainCtxts(), used foreach + extracted local variable "latestServerState" (no need to duplicate it) + collapsed one if statement. Removed commented out code. ECLServerWriter.java: Minor code cleanup: - Removed useless parentheses - Collapsed if statements git-svn-id: https://svn.forgerock.org/opendj/trunk@9673 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
* rename CSN comparison methods to make them easier to understand. git-svn-id: https://svn.forgerock.org/opendj/trunk@9672 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Slayered walking dead code. Walking dead code is code that looks it is alive, tastes just like if it was alive, but there is funny smell about it, and actually... it turns out this code is dead. ReplicationServerDomain.getEligibleState() is walking dead code because: - JEChangelogDB.getCSNAfter() always returns null: the API of ReplicaDBCursor mandates to call call next() before calling getChange(), however getCSNAfter() fails to do so, hence getChange() always returns null, which means getCSNAfter() always returns null. - the "result" local variable is a duplicate of "latestState", which means it starts of with the exact same state. The code iterates through "latestState" to get its CSNs, calling update() on "result" with these CSNs. But... since "result" duplicates "latestState", it has the exact same CSNs, which means calling update() will have no effect on "result", leaving it on the same state as it was before the iterations. ECLServerHandler.java, ReplicationServer.java: Replaced ReplicationServerDomain.getEligibleState() with ReplicationServerDomain.getLatestServerState().duplicate() where applicable. ReplicationServerDomain.java: Removed getEligibleState() which does literally nothing, but in a very inneficient way. ReplicationDomainDB.java, JEChangelogDB.java: Removed getCSNAfter(), now become unused. git-svn-id: https://svn.forgerock.org/opendj/trunk@9671 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
* remove serverId parameter from ReplicationDomainDB#publishUpdateMsg(). git-svn-id: https://svn.forgerock.org/opendj/trunk@9670 41b1ffd8-f28e-4786-ab96-9950f0a78031
05 Oct, 2013
2 commits
-
I think it was invalid to think that we might want to call getCount() for a given serverId (hence replicaDB) by using the serverId from one of the CSNs. We can very well call getCount() with from and to CSNs that are not present on the targeted replicaDB. git-svn-id: https://svn.forgerock.org/opendj/trunk@9667 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Fixed problem introduced in tests at r9648. HeartBeatMsg.java: Added toString(). git-svn-id: https://svn.forgerock.org/opendj/trunk@9666 41b1ffd8-f28e-4786-ab96-9950f0a78031
04 Oct, 2013
8 commits
-
Note that these tests may still fail some time to time, since they expect the JMX connection handler to start in less than 1 second, which might be low on a single cpu VM. git-svn-id: https://svn.forgerock.org/opendj/trunk@9664 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
* fix minor behavior change introduced in r9660. git-svn-id: https://svn.forgerock.org/opendj/trunk@9663 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Renamed some classes in package src.server.org.opends.server.replication.server.changelog.je: - DbHandler.java => JEReplicaDB.java (and tests) - DraftCNDbHandler.java => JEChangeNumberIndexDB.java (and tests) - DraftCNDbIterator.java => JEChangeNumberIndexDBCursor.java *.java: Consequence of the renames. Changed methods/variables/parameter names and comments to reflect the new names. In particular, bye bye to DraftCNDb, DbHandler and welcome to CNIndexDB and ReplicaDB. git-svn-id: https://svn.forgerock.org/opendj/trunk@9662 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
* remove serverId parameter from ReplicationDomainDB.getCount(DN, int, CSN, CSN) git-svn-id: https://svn.forgerock.org/opendj/trunk@9661 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
* convert ServerState to implement Iterable<CSN> instead of Iterable<Integer> git-svn-id: https://svn.forgerock.org/opendj/trunk@9660 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Changes after review from Matthew Swift. ReplicationServerDomain.java Renamed changelogDB field to domainDB + changed type. ChangelogDB.java, JEChangelogDB.java: Extracted interface ReplicationDomainDB from this interface. Added getReplicationDomainDB(). ReplicationDomainDB.java: ADDED git-svn-id: https://svn.forgerock.org/opendj/trunk@9659 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Changes after review from Matthew Swift. ChangelogDB.java, JEChangelogDB.java: Removed getDBDirectoryName(), not needed anymore. In getDomainServerIds(), now return an unmodifiable set. In getDomainOldestCSNs() and getDomainNewestCSNs(), now return a ServerState object. ReplicationServerDomain.java: Consequence of the change to ChangelogDB. ReplicationServer.java Consequence of the change to ChangelogDB. Added config instance field + removed all the instance field that are duplicating its info + added getConfiguredRSAddresses() to replace toHostPorts() + adapted the code + moved some javadocs. git-svn-id: https://svn.forgerock.org/opendj/trunk@9658 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
LDAPReplicationDomain.replay() may lose error messages after too many replay attempts if "op" gets overwritten. LDAPReplicationDomain.java: In replay(): - Added the "nextOp" local variable so the code can keep error messages in the "op" local variable until the next loop iteration starts. - Reduced as much as possible the scope of local variables to avoid the need to reinitialize them. - Renamed "newOp" local variables to "castOp" git-svn-id: https://svn.forgerock.org/opendj/trunk@9657 41b1ffd8-f28e-4786-ab96-9950f0a78031
03 Oct, 2013
2 commits
-
These changes are adding a new optional configuration parameter : rmi-port, to allow specifying a fixed port for the RMI connection underlying JMX. This is required when managing applications need to connect to OpenDJ through a firewall. CR-2429. git-svn-id: https://svn.forgerock.org/opendj/trunk@9655 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
This code is never used + UpdateMsg already implements Comparable. git-svn-id: https://svn.forgerock.org/opendj/trunk@9647 41b1ffd8-f28e-4786-ab96-9950f0a78031
02 Oct, 2013
4 commits
-
Fixed a compile error (how did it slip through?) introduced in r9642 with a change that disabled Berkeley JE database stats collection in order to not incur performance problems. git-svn-id: https://svn.forgerock.org/opendj/trunk@9643 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
ChangelogDB.java: In removeDomain(), now throws ChangelogException. JEChangelogDB.java: In clearDB(), only clear the DB if the directory exists on disk. In removeDomain() and shutdownDomain(), removed the entry associated to the baseDN key. In removeDomain(), now throw ChangelogException + moved exception handling to ReplicationServerDomain.clearDbs(). ReplicationServerDomain.java: In clearDbs(), moved the exception handling here from lower level JEChangelogDB.removeDomain(). ReplicationDbEnv.java: Added allDbs and isShuttingDown fields to record all created Databases and mark when shutting down is in progress. In openDatabase(), throw exceptions when the DB is shutting down. In shutdown(), close all the opened DBs. Added closeDB() and newErrorMessage(). In clearGenerationId(), clearServerId() and deleteFromChangelogStateDB(), now throw ChangelogException. In clearDb(), changed parameter from String to Database. DraftCNDB.java, ReplicationDB.java: In clear(), rely more on ReplicationDbEnv.clearDb(Database). In isDBClosed(), added more conditions. ReplicationTestCase.java: Removed useless call to cleanUpReplicationServersDB() before removeReplicationServerDB(). Added remove(Collection<ReplicationServer>) to factorize code between removeReplicationServerDB() and remove(ReplicationServer...). ReplicationServerTest.java: Removed all calls to clearChangelogDB() before calling changelogBasic(), because this is the first thing the latter method does. Added getCSNFieldName() to have more explicit failures. In windowProbeTest(), used HostPort. ECLServerHandler.java: Removed never thrown DirectoryException. git-svn-id: https://svn.forgerock.org/opendj/trunk@9642 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
Test started failing after upgrading to Berkeley JE "5.0.84" (instead of "5.0.73"). The newer version has StatCapture class that writes to disk on shutdown which is creating a problem with JEChangelodDB.removeDB(). JEChangelodDB.java: In removeDB(), reversed the order: shutdown the DB before deleting the DB directory. git-svn-id: https://svn.forgerock.org/opendj/trunk@9641 41b1ffd8-f28e-4786-ab96-9950f0a78031
-
ConfigEntry.java: Changed toString(), to only output the DN of the entry to prevent: - dumping excessively large entries - developers to inadvertently dump sensitive information in the logs git-svn-id: https://svn.forgerock.org/opendj/trunk@9640 41b1ffd8-f28e-4786-ab96-9950f0a78031