org.forgerock / org.forgerock.opendj

23 Dec, 2013

6 commits

cd2a74eb Checkpoint commit for OPENDJ-1235 : Migrate configuration framework ... Browse Code »

* Refactor and clean ConstraintTest in admin.server package
** Tests are running without server start
** Use data providers for better readability and less code duplication

* Factorize some common helper methods in AdminTestCase class

git-svn-id: https://svn.forgerock.org/opendj/trunk@10053 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-23 14:59:10 +0000

0a273c8b Fix OPENDJ-1115: Internal errors from ModifyOperation - change number was not found in pending list ... Browse Code »

* ensure that changes are not added to the replay queue twice, e.g. during recovery when the queue already contains uncommitted changes.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10052 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-23 13:54:49 +0000

ee404a6e * Modify LDIF#makeEntries and LDIF#makeEntry methods to throw RuntimeException ... Browse Code »

** Localize exception
** Return exception for all edge cases
** Add two new messages in core.properties for edge cases

* Add two new convenience methods LDIF makeEntries and makeEntry that 
   accepts List<String>

* Adapt unit tests to changes

git-svn-id: https://svn.forgerock.org/opendj/trunk@10051 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-23 12:07:00 +0000

3d45be9d Simple fix for OPENDJ-1082: Order attributes according to search request attribute list order ... Browse Code »

Use LinkedHashMap when filter entries before returning them in search results. This ensures that attributes are mostly returned in the same order that they were requested. I use the word "mostly" because user attributes will still be grouped together ahead of operational attributes.

Verbally reviewed by Ludo.



git-svn-id: https://svn.forgerock.org/opendj/trunk@10050 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-23 12:03:45 +0000

1089ff03 OPENDJ-1263 Changenumber does not progress on the second replication server of a topology ... Browse Code »


The medium consistency point was not progressing on DSRS 2 because the ChangeNumberIndexer mediumConsistencyCSN had been polluted by CSN from "cn=admin data".
Problem is that ChangeNumberIndexer's publishUpdateMsg() was filtering out updates from ECL disabled domains, but not from domains unknown to ECL.
On start up, update messages can be received from replication domains have not been been configured yet on the current replication server.
The fix consists in only updating the medium consistency point with update messages or replica heartbeats coming from explicitly enabled replication domains.
After this fix, changes from ECL disabled domains will still be stored in dedicated replicaDBs, there is no change in this functionality.


MultimasterReplication.java
Renamed isECLDisabledDomain() to isECLEnabledDomain() so it caters better for the 3 states of the domains: enabled, disabled and unknown
Code cleanup.

ChangeNumberIndexer.java:
Extracted method isECLEnabledDomain() to use as a seam for unit testing which calls to MultimasterReplication.isECLEnabledDomain().

ChangeNumberIndexerTest.java
Added one test emptyDBThreeInitialDSsOneIsNotECLEnabledDomain().
Renamed assertAddedRecords() to assertExternalChangelogContent(), startIndexer() to startCNIndexer(), stopIndexer() to stopCNIndexer() and indexer to cnIndexer.
In startCNIndexer(), overrode ChangeNumberIndexer.isNotECLEnabledDomain().

AttributeTypeConstants.java:
Added support for "cn"


git-svn-id: https://svn.forgerock.org/opendj/trunk@10049 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-23 10:18:05 +0000

37a32d08 Checkpoint commit for OPENDJ-1235 : Migrate configuration framework ... Browse Code »

* Refactor and clean DefaultBehaviorTest in admin.server package
** Tests are running without server start
** Use data providers for better readability and less code duplication

* Fix issues in ServerManagementContext due to incorrect migration 
   from server code
** Decoding of attributes was returning only the first value of 
  multivalued attributes

* Minor naming cleanup

git-svn-id: https://svn.forgerock.org/opendj/trunk@10048 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-23 10:07:13 +0000

20 Dec, 2013

15 commits

95648571 * Move makeEntries and makeEntry methods from TestCaseUtils to LDIF class. ... Browse Code »

* Add both methods to Entries class as well (indirection to LDIF implementations).

* Add test for both methods in LDIFTestCase. 

git-svn-id: https://svn.forgerock.org/opendj/trunk@10047 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 18:49:54 +0000

882a997b OPENDJ-1231 Make the Medium Consistency Point support replica heartbeats ... Browse Code »

Prevent instantiating a HashSet for every replica heartbeat or UpdateMsg.

MultimasterReplication.java:
Added isECLDisabledDomain(DN).

ChangeNumberIndexer.java:
Removed isExcludedFromECL(), replaced by MultimasterReplication.isECLDisabledDomain().

git-svn-id: https://svn.forgerock.org/opendj/trunk@10046 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 18:00:40 +0000

df8a9791 OPENDJ-1231 Make the Medium Consistency Point support replica heartbeats ... Browse Code »

Christophe reported to me that functional tests with the changeNumber were failing.
After investigation on my side, it turns out that the mediumConsistencyCSN was blocked on a "cn=admin data" or "cn=schema" CSN.
Fix consists in excluding these domains in ChangeNumberIndexer's publishHeartbeat() and publishUpdateMsg() methods.


ChangeNumberIndexer.java:
Added isExcludedFromECL() + used it from publishHeartbeat() and publishUpdateMsg() to exclude undesired domains.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10045 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 16:52:22 +0000

644020d2 Fixed a NullPointerException in ReplicationServerDomain.getEligibleCSN(). ... Browse Code »
```
Ensured ReplicationDomainDB.getDomainLastAliveCSNs() never returns null.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10044 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-12-20 14:58:20 +0000
14a0f0b1 Checkpoint commit for OPENDJ-1235 : Migrate configuration framework ... Browse Code »
```
* Fix DNBuilderTest

git-svn-id: https://svn.forgerock.org/opendj/trunk@10043 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
nicolas.capponi@forgerock.com
2013-12-20 14:56:12 +0000

fb7edb84 OPENDJ-1205 Remove network layer from External ChangeLog implementation ... Browse Code »


ExternalChangeLogSession.java, ExternalChangeLogSessionImpl.java: REMOVED

ReplicationServer.java:
Inlined createECLSession().

ECLSearchOperation.java:
Changed field ExternalChangeLogSession eclSession into ECLServerHandler eclServerHandler.
Converted startECLSessionMsg field to local variable.
Added method shutdownECLServerHandler().

git-svn-id: https://svn.forgerock.org/opendj/trunk@10042 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 14:43:11 +0000

58a13ec9 Checkpoint commit for OPENDJ-1235 : Migrate configuration framework ... Browse Code »

* Refactor server classes to remove ConfigEntry class
** Move listener registration from ConfigEntry to ConfigurationRepository
** Use DN to register or retrieve listeners
** Use Entry in ConfigXXXListener classes

* Refactor server classes to remove ServerManagementContext singleton
** Server context is passed as argument in constructors

* Migrate test cases from org.opends.server.admin.server package
** Rewrite ListenerTest class to test listeners without server start, using mocks
** Other test cases are not working yet

git-svn-id: https://svn.forgerock.org/opendj/trunk@10041 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 14:37:56 +0000

bb139260 Tests cleanup. ... Browse Code »


ReplicationTestCase.java
Removed emptyOldChanges parameter from openReplicationSession() methods because it has no effect whatsoever.

ReplicationServerTest.java:
Overrode openReplicationSession() to also check the broker is connected.

InitOnLineTest.java:
Stopped constantly calling DN.decode() and used instance variable instead.

*.java:
Consequence of the changes to ReplicationTestCase.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10040 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 14:30:48 +0000

b77c6d9b Checkstyle cleanup ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10039 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
ludo
2013-12-20 14:03:27 +0000

6f46ad47 Removed dead code that has been in the file since begining of times. ... Browse Code »

Extracted duplicated code into methods cleanup(), getArchiveFile()
Added a couple of FIXME comments around  dubious or clumsy code portions


git-svn-id: https://svn.forgerock.org/opendj/trunk@10038 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 13:36:24 +0000

2f8e3d0e In ReplicationBroker, removed null checks on the replication domain. ... Browse Code »

Had to change integrated unit tests to pass a dummy replication domain.


ReplicationBroker.java:
Removed null checks on the domain.

DummyReplicationDomain.java: ADDED

ReplicationTestCase.java:
Removed the replicationDomain parameter which were always passed as null.
Could remove one openReplicationSession() method.
Passed in a DummyReplicationDomain when creating a ReplicationBroker.


ExternalChangeLogTest.java, ReplicationServerTest.java, HistoricalCsnOrderingTest.java, StateMachineTest.java:
Passed in a DummyReplicationDomain when creating a ReplicationBroker.
Also consequence of removing the replicationDomain parameter in ReplicationTestCase.openReplicationSession().

git-svn-id: https://svn.forgerock.org/opendj/trunk@10037 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 13:17:57 +0000

cee3b8f4 AssuredReplicationServerTest.java: ... Browse Code »
```
Fixed compile error.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10036 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-12-20 12:32:57 +0000

19cc802d Fixed continuous integration tests failure with FractionalReplicationTest. ... Browse Code »

ReplicationBroker.java:
Reinstated previous code behaviour (somewhat unclear) where the session can directly be used right after performPhaseTwoHandshake() succeeds.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10035 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 11:57:21 +0000

6f7eccc5 More code cleanups ... Browse Code »

ReplicationDomain.java, LDAPReplicationDomain.java:
Removed unused parameters from sessionInitiated().
Inlined Message passed into logError().

ReplicationBroker.java:
Consequence of the change to ReplicationDomain.sessionInitiated().
Extracted method mustAvoidYoyoEffect().

git-svn-id: https://svn.forgerock.org/opendj/trunk@10034 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 11:29:03 +0000

4c4a2099 Code cleanup ... Browse Code »


ReplicationDomain.java:
Added missing curly brackets.
Added IEContext.setExceptionIfNoneExist() + used it throughout.

LDAPReplicationDomain.java:
In decodeSource(), removed insane control flow.
Called StaticUtils.stackTraceToSingleLineString() instead of Exception.getLocalizedMessage() or Exception.getMessage().
Collapsed @inheritDoc javadocs.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10033 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-20 11:01:48 +0000

19 Dec, 2013

8 commits

7fc96ae5 Minor cleanup: combine multiple Reject.ifNull() calls if possible into varargs calls. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10031 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-12-19 16:34:56 +0000

70be36a7 Second step in simplifying the ReplicationBroker class. ... Browse Code »


ReplicationBroker.java
Moved session field to ConnectedRS.
Removed field protocolVersion (useless, superseded by ConnectedRS)
Reworked ConnectedRS class: removed connected field.
In ReplicationServerInfo, added setServerURL() + internally stored a RSInfo object + changed connectedDSs from List to Set.
Used 
Improved javadocs + removed comments redundant with javadocs.

ComputeBestServerTest.java:
Consequence of the change to ReplicationBroker.ReplicationServerInfo ctor.

UnbindOperationTestCase.java, ReplicationDomain.java:
Code cleanup.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10030 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-19 16:31:41 +0000

924fb3fe Minor refactoring: remove Validator class and use forgerock-util Reject instead. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10029 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-12-19 14:51:01 +0000

acb3f9de First step towards simplifying the ReplicationBroker class. ... Browse Code »

ReplicationBroker.java:
Changed monitorResponse from MutableBoolean to AtomicBoolean.
Replaced fields rsGroupId, rsServerId, rsServerUrl, replicationServer and connected by a single connectedRS + added immutable inner class ConnectedRS.
Renamed updateRSInfoLocallyConfiguredStatus() to setLocallyConfiguredFlag().
In receiveTopo(), used Collections.retainAll().

MutableBoolean.java: REMOVED

git-svn-id: https://svn.forgerock.org/opendj/trunk@10028 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-19 09:24:04 +0000

6550b941 Fixing test failure in Continuous Integration. ... Browse Code »

ReplicationServerTest.java:
In windowProbeTest(), code only expected to receive a WindowMsg in answer to a WindowProbeMsg sent out. The twist is that it only cares about receiving a WindowMsg which means it can discard every other type of messages in the interim, particularly the ones coming from the protocol: MonitorMsgs, HeartbeatMsgs, etc. Used ReplicationTestCase.waitForSpecificMsg() to achieve this.

AssuredReplicationPluginTest.java:
Code cleanup.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10027 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-19 09:21:31 +0000

c87689bc Minor code cleanup. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10026 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-12-19 09:19:59 +0000
4a2d93ca Additional fix for OPENDJ-1253: Test upgrade to latest doc build plugin ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10025 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
mark
2013-12-19 09:10:44 +0000

97165656 Code cleanup of extended operations. ... Browse Code »


ExtendedOperationHandler.java:
Added ctor ExtendedOperationHandler(Set<String> supportedControlOIDs).
Implemented initializeExtendedOperationHandler() and finalizeExtendedOperationHandler() by moving common code here from subclasses impls.
Made registerControlsAndFeatures() and deregisterControlsAndFeatures() private.
Added overridable method getExtendedOperationOID().

GetSymmetricKeyExtendedOperation.java, CancelExtendedOperation.java, GetConnectionIDExtendedOperation.java, PasswordModifyExtendedOperation.java, PasswordPolicyStateExtendedOperation.java, StartTLSExtendedOperation.java, WhoAmIExtendedOperation.java:
Removed getSupportedControls() + supportedControlOIDs field member where present - superseded by the superclass ones.
In initializeExtendedOperationHandler(), delegated to superclass method. Cannot replace it fully because method signatures do not match.
Removed finalizeExtendedOperationHandler(), rely on superclass implementation where possible.
Implemented getExtendedOperationOIDI() and getExtendedOperationName() sometimes.
Code cleanup.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10024 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-19 08:37:13 +0000

18 Dec, 2013

2 commits

a66c4f8d Typo ... Browse Code »

git-svn-id: https://svn.forgerock.org/opendj/trunk@10023 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-18 15:12:08 +0000

335044d2 Align with fix for DOCS-121; additional fix for OPENDJ-1253 ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10022 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
mark
2013-12-18 14:00:18 +0000

17 Dec, 2013

9 commits

aabd56a1 Fix OPENDJ-1246: NPE while creating a new index ... Browse Code »

Don't register configuration change listener in constructor since the constructor is invoked during configuration validation as well as when applying the configuration change. Instead register the listener once the index has been opened, which is only done during backend init and when adding new indexes, and which is also symmetric with listener deregistration which is performed when closing indexes.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10021 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-17 22:32:48 +0000

281fbaac Remove dead code. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10020 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-12-17 22:27:57 +0000
96d9ff73 Fixed aci/targattrfilter/aci_targattrfilter_019 testcase ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10019 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
csovant
2013-12-17 17:15:26 +0000

9bbb44ce OPENDJ-1172 Deadlock between replication threads during shutdown ... Browse Code »

Review of the approach: Matthew Swift


Problem is caused by code deep into method calls that calls ReplicationServer.shutdown().
Thread 1 holds a lock on MessageHandler.msgQueue, an exception happens during processing and it then it calls ReplicationServer.shutdown() which then goes and tries to grab JEReplicaDB.msgQueue.
Thread 2 holds a lock on JEReplicaDB.msgQueue and then tries to grab MessageHandler.msgQueue.

The proper fix is to let the exceptions bubble up to the Thread.run() method, releasing all locks in the process, and call ReplicationServer.shutdown() from there.


replication.properties
Added stack traces to error messages.

ReplicationServerDomain.java:
Consequence of the change to the error messages, removed the use of MessageBuilder.

JEUtils.java: ADDED
Factorized all the code closing JE Transactions.

DraftCNDB.java, JEChangeNumberIndexDB.java, ReplicationDB.java:
Let ChangelogExceptions propagate up.
Used JEUtils.abort().
Consequence of the change to the error messages, removed the use of MessageBuilder.

JEReplicaDB.java:
Handled ChangelogException bubbling up here.
Extracted stop(Exception) method.

ReplicationDbEnv.java
removed one shutdownOnException() method.
Inlined innerShutdownOnException().
Consequence of the change to the error messages, removed the use of MessageBuilder.

git-svn-id: https://svn.forgerock.org/opendj/trunk@10018 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-17 16:30:13 +0000

7becdd9d Added unit tests to requests ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10017 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
violette
2013-12-17 15:07:12 +0000

36d74de5 OPENDJ-1231 Make the Medium Consistency Point support replica heartbeats ... Browse Code »


Code cleanup: removed code that has been obsoleted by having the separate ChangeNumberIndexer thread.
Matt and I think that this code was necessary because the change number was computed lazily.
Now that the change number is computed eagerly, there is no need for this obsolete code.


Additional potential work that might be done later:
- Could we remove the counter records from the replicaDBs?
- Could we remove ECLServerHandler.eligibleCSN()?


ReplicationServer.java:
In getECLChangeNumberLimits():
- removed the for loop inferring the "eligibleCount", i.e. the number of changes that are in the replicaDBs but not yet in the ChangeNumberIndexDB
- removed all the parameters which are now useless

ReplicationServerDomain.java, ReplicationDomainDB.java, JEChangelogDB.java, JEReplicaDB.java, ReplicationDB.java:
Transitively removed all the methods that were called by ReplicationServer.getECLChangeNumberLimits().

ECLServerHandler.java, FirstChangeNumberVirtualAttributeProvider.java, LastChangeNumberVirtualAttributeProvider.java:
Removed all the code that was getting and passing in the parameters of ReplicationServer.getECLChangeNumberLimits().

ExternalChangeLogTest.java:
Removed now useless test ECLReplicationServerFullTest10().

JEReplicaDBTest.java:
Renamed testDbCounts() to testGetOldestNewestCSNs().
Removed now useless test testGetCountNoCounterRecords()

git-svn-id: https://svn.forgerock.org/opendj/trunk@10016 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-17 15:05:55 +0000

3b18e4f7 Fix checkstyle error ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10015 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
nicolas.capponi@forgerock.com
2013-12-17 14:39:46 +0000
4170c308 Removed dot. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@10014 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
violette
2013-12-17 14:19:29 +0000

947a40b5 Checkpoint commit for OPENDJ-1235 : Migrate configuration framework ... Browse Code »

* Migrate all tests from org.opends.server.admin.client.ldap package
** Remove server start from all tests

* Fixes in LDAPManagedObject and LDAPNameBuilder classes :
 wrong code conversion from javax.naming classes to SDK DN/RDN classes
 




git-svn-id: https://svn.forgerock.org/opendj/trunk@10013 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-12-17 14:07:42 +0000