org.forgerock / org.forgerock.opendj

26 Sep, 2013

4 commits

  • 3774f07a   LDAPReplicationDomain.java: ... Browse Dir » 
    Undoing the rushed r9606 because:
- In buildAndPublishMissingChanges(), the parameter was used in the tests
- There were unintended changes in this

git-svn-id: https://svn.forgerock.org/opendj/trunk@9607 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • ced21c19   Code cleanup. ... Browse Dir » 
    
LDAPReplicationDomain.java:
In buildAndPublishMissingChanges(), removed ReplicationBroker parameter and used broker field instead.


*Test.java:
Removed try / catch / fail test anti pattern.
Inlined local variables.

AssuredReplicationPluginTest.java:
Extracted methods assertBlockedForLessThanTimeout() assertBlockedLongerThanTimeout(), 
Inlined sleep().
In getErrorsByServers(), improved the code.

ReplicationServerTest.java:
Split changelogChaining() test into changelogChaining0() and changelogChaining1() to match the previous double testing + then simplified the code.
Extracted methods receiveReplicationMsgs(), assertOnlyTopologyMsgsReceived().
Used CSNGenerator.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9606 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 43fd411d   OPENDJ-1134 (CR-2355) Introduce a class in replication for encapsulating host+port combinations ... Browse Dir » 
    *Msg.java:
Used DN.toNormalizedString() instead of DN.toString() for better perfs.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9605 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 75e7b9ca   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    String baseDn => DN baseDN

The change mostly affects package org.opends.server.replication.protocol and dependent classes.


ModifyCommonMsg.java:
In getMods(), called decodeMods()

ReplicationTestCase.java:
Converted removeDomain(Entry) to removeDomain(Entry...).

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

25 Sep, 2013

3 commits

  • 4a29c6e0   ReplicationServerDomain.java: ... Browse Dir » 
    Extracted toServerState() method.
Renamed getDbServerState() to getLatestServerState().

ReplicationDomainCfgDefn_fr.properties:
Upgraded "property.replication-server.description" to match the latest english description.

*.java:
Consequence of renaming ReplicationServerDomain.getDbServerState().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9600 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • f9746fe6   OPENDJ-1134 (CR-2355) Introduce a class in replication for encapsulating host+port combinations ... Browse Dir » 
    Now the replication code uses HostPort class for comparisons instead of "host:port" Strings.
Changed all the HostPort variable/parameter names to *Address instead of *URL. Left all the relevant String variable/parameter names to *URL.


HostPort.java:
Removed LocalAddress(String), not used anymore.
Moved getLocalAddress() here from ReplicationServer.
Created localAddress() static method.
Extracted method toInetSocketAddress() and moved it here.

ReplicationServer.java:
Created converting method toHostPorts() + used it everywhere replicationServerUrls was accessed.
Replaced getNormalizedLocalURL() and normalizeServerURL() with simply calling HostPort.localAddress() and HostPort.valueOf().
In getConnectedRSUrls(), changed return type from Set<String> to Set<HostPort>.
In connect() and disconnectRemovedReplicationServers(), used HostPort as a parameter instead of String.

ReplicationServerDomain.java:
In stopReplicationServers(), used HostPort as a parameter instead of String.

ReplicationServerHandler.java:
Extracted method toServerAddressURL().

ReplicationBroker.java:
Consequence of the change to HostPort.


ReplSessionSecurity.java:
In isSslEncryption() removed unused parameter.
Used StaticUtils.close().

ReplicationServerConfiguration.xml, ReplicationServerCfgDefn.properties:
Added precisions on how to specify the "replication-server" property.

ReplicationServerDynamicConfTest.java, ReplServerFakeConfiguration.java:
Updated because this test was failing.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9599 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • f83d8df3   Fix OPENDJ-18 - keystore import failes due to empty PIN ... Browse Dir » 
    Review CR-2353

* Removed constraints on the mandatory presence of a PIN, to allow use of empty PIN. 
   These contraints were implemented in several places :
  - configuration files : FileBasedKeyManagerProviderConfiguration.xml, PKCS11KeyManagerProviderConfiguration.xml
  - corresponding provider classes : FileBasedKeyManagerProvider.java, PKCS11KeyManagerProvider.java
  - setup tool : CertificateManager.java, InstallDS.java (for CLI), SecurityOptionsDialog.java (for GUI) 

* Removed corresponding admin messages that are no more used in FileBasedKeyManagerProviderCfgDefn.properties and PKCS11KeyManagerProviderCfgDefn.properties
* Removed corresponding messages that are no more used in extension.properties and quicksetup.properties
* Added management of issue JDK-6879539 that prevents usage of empty PIN. This issue occurs on JDK older than JDK7.
* Modified unit tests according to new behavior : FileBasedKeyManagerProviderTestCase.java, CertificateManagerTestCase.java

* Added a new utility method StaticUtils#stackTraceContainsCause to check if an exception contains a given cause.



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

24 Sep, 2013

4 commits

  • a7f48d90   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Changes after review from Matt.

*.java:
Changed terminology for easier reading:
- First => Oldest
- Last => Newest

git-svn-id: https://svn.forgerock.org/opendj/trunk@9590 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 4081bc61   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Changes after review from Matt.

*.java:
Changed terminology for easier reading:
- First => Oldest
- Last => Newest

git-svn-id: https://svn.forgerock.org/opendj/trunk@9589 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 9e4bb783   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Changed after review from Matt.

ChangelogDB.java:
Removed setReplicationDBDirectory(), now set in JEChangelogDB constructor.
Renamed getDBDirName() to getDBDirectoryName().
Improved javadocs.

JEChangelogDB.java:
Consequence of the changes to ChangelogDB.
Renamed dbDirName to dbDirectoryName.
Made 2 fields final.
Added makeDir().

ReplicationServer.java:
Consequence of the changes to ChangelogDB.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9581 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • c7f19721   OPENDJ-1134 (CR-2338) Introduce a class in replication for encapsulating host+port combinations ... Browse Dir » 
    HostPort.java:
Improved javadocs.
Improved host normalization for and used remote IP addresses for remote hosts (complies with code from ReplicationServer.java.disconnectRemovedReplicationServers()).
Renamed normalizedHost() tpo normalizeHost().
Removed trimming for serverURLs.
In valueOf(), added a special case to reject unbracketed IPV6 addresses.
Extracted constant LOCALHOST to avoid typos.
Reworked the code from isLocalAddress(), equals(), hashCode().

HostPortTest.java:
Reworked some tests.
Added new tests.

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

23 Sep, 2013

3 commits

  • 2c3ea1a5   LDAPURLTest.java: ADDED ... Browse Dir » 
    LDAPURL.java:
Weakened urlDecode() visibility from private to package to allow easy unit testing.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9578 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 2195127e   Fix OPENDJ-737 - OpenDJ Administration Connector KeyStore Pin File must be defined and non empty ... Browse Dir » 
    Review CR-2344

NPE occurs in AdministrationConnector#createSelfSignedCertificateIfNeeded method.
To avoid this, now attempt to create certificate only if initial setup has not been changed. 

* AdministrationConnector.java : 
  - completed method createSelfSignedCertificateIfNeeded to add more checks to detect when initial setup has changed
  - added method hasDefaultConfigChanged to isolate the check

* No unit test added, functional test to be added


git-svn-id: https://svn.forgerock.org/opendj/trunk@9577 41b1ffd8-f28e-4786-ab96-9950f0a78031
    nicolas.capponi@forgerock.com
     
  • fb30a900   OPENDJ-1134 (CR-2338) Introduce a class in replication for encapsulating host+port combinations ... Browse Dir » 
    Augmented HostPort class to support the use cases mentioned in OPENDJ-1134.
Moved host splitting and port range validation to HostPort class.


HostPort.java:
Added valueOf() to parses a "host:port" URL + Added extractPort(), normalizePort(), normalizedHost(), removeExtraChars().
Moved isLocalAddress() code here from StaticUtils.
Added normalizedHost field, toNormalizedString() and toString(String) + modified hashCode() and equals() to ensure stability of the results returned by hashCode() and equals().
Added allAddresses() to hide HostPort(int).
Moved isEquivalentTo() code here from ReplicationBroker.isSameReplicationServerUrl().

HostPortTest.java:
Added.

StaticUtils.java:
Moved isLocalAddress() and related code to the HostPort class.

ReplicationBroker.java:
Moved some isSameReplicationServerUrl() to HostPort as isEquivalentTo().

*.java:
Used the new HostPort ctor everywhere.
It simplified the code in many places and also helped remove duplicated code.

ComputeBestServerTest.java:
Added ports to serverURLs to ensure tests still pass.

*Test.java:
Removed the test anti-pattern try/catch/fail.

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

20 Sep, 2013

1 commit

19 Sep, 2013

4 commits

  • b2f1e558   Left over from r9478 ... Browse Dir » 
    JEChangelogDB.java:
In getCursorFrom(), renamed local variable "it" to "cursor".

git-svn-id: https://svn.forgerock.org/opendj/trunk@9556 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • bd3b5c00   OPENDJ-1149 (CR-2334) Passwords should not be held in memory for the lifetime of a client connection ... Browse Dir » 
    
Note this change does not cater for:
- the bind operations where the password is used to authenticate. The password is held in memory for as long as it takes to complete the bind operation (and the OS flushing the network packets, etc.)
- REST operations where the web container (and the OS network stack) holds a HTTPServletRequest object for as long as it takes to process the request.


AuthenticationInfo.java:
Removed simplePassword and saslCredentials fields + getters (never used) to ensure they are not held for the lifetime of an LDAP connection.
In few methods, reversed conditions to ensure accessed variables are all directly put under a null check.

CollectClientConnectionsFilter.java
Wiped out the password ASAP, even though this is a bit pointless since the password is held by the web container for the lifetime of a REST call, either in the headers or via HTTP basic authentication.

*.java:
Consequence of the changes to AuthenticationInfo ctors.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9554 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 048e14f5   ECLServerHandler.java: ... Browse Dir » 
    In findCookie(), reverted an if statement to use an early exit in case of error. It improves readability by making this code consistent with the other code in this method.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9553 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 1679f6af   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    In replication converted the use of String for baseDN to use actual DNs.

LDAPReplicationDomain.java:
Used getBaseDNString() instead of getBaseDN() in String context. It will use toNormalizedString() instead of using toString() which is safer.

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

18 Sep, 2013

5 commits

  • 0e9e1dd6   Fix OPENDJ-1058 – HeartbeatConnectionFactory does not actively shutdown dead connections ... Browse Dir » 
    * update Rest2LDAP documentation due to new configuration options.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9549 41b1ffd8-f28e-4786-ab96-9950f0a78031
    matthew
     
  • c62be59c   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Removed ReplicationServer.disableEligibility() stateful method and instead passed this list down as parameter in the methods that require it which is 1- cleaner and 2- safer with regards to concurrent programming (Particularly in ECLServerHandler).
In ECLServerHandler.initialize(), called refreshEligibleCSN() to remove duplicate code.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9547 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • b9fc7381   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    
In replication converted the use of String for baseDN to use actual DNs.

By looking at the code, I am a bit afraid that some paths in the code were doing DN.equals(String) or vice-versa. Problem is that the current changes might change the behaviour of these paths. One example I spotted is in LDAPReplicationDomain.isSolveConflict().


LDAPReplicationDomain.java:
Removed fields serverId and baseDn already held in parent class + Used getServerId(), getBaseDN() and getBaseDNString() + moved getBaseDN() to ReplicationDomain.

ReplicationDomain.java:
Moved getBaseDN() here from LDAPReplicationDomain.


ReplicationServer.java:
In getECLChangeNumberLimits(), removed unnecessary code parsing a String. Now, the code will not throw a DirectoryException when the cookie cannot be parsed. I do not think this is a problem since the result of the parsing was never used anyway.

ReplicationBroker.java:
In performPhaseOneHandshake(), used StaticUtils.close().
In performECLPhaseTwoHandshake(), changed return type to void.

*.java:
Converted baseDNs from String type to DN type.
Renamed a few getBaseDn() to getBaseDN().

*Test.java:
Removed useless try / catch / fail test anti patterns.
Changed some fake DNs to have DN-valid syntaxes.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9546 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • af8acb29   DN.java: ... Browse Dir » 
    Checkstyle mi amor

git-svn-id: https://svn.forgerock.org/opendj/trunk@9545 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • e228711d   DN.java: ... Browse Dir » 
    In toNormalizedString(), complemented the javadoc.
Comments => javadocs.

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

17 Sep, 2013

6 commits

  • ddfa2db7   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Investigating ExternalChangeLogTest.ECLReplicationServerFullTest(), I found a bug introduced by r9538.
In DraftCNDBCursor(long) ctor, when returning null, the code did not release the readLock anymore. Previously, it threw an exception that was caught, then released the readLock and rethrown.
Problem is there was an underlying bug in the previous code too: when the DB was already closed, the readLock would not be released at all.

Now by introducing the cursorHeld local variable, the readLock is appropriately released in the finally clause when no cursor is held at all.
Also fixed the code in DraftCNDBCursor().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9542 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • ced8d59f   Fix typos in error cases ... Browse Dir » 
    git-svn-id: https://svn.forgerock.org/opendj/trunk@9541 41b1ffd8-f28e-4786-ab96-9950f0a78031
    cjr
     
  • 1a548b72   ReplicationServer.java: ... Browse Dir » 
    Added a debug statement to help diagnose a ClassCastException in ReplicationServerTest.windowProbeTest().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9540 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 98ea90c5   Checkstyle you are the love of my life! ... Browse Dir » 
    git-svn-id: https://svn.forgerock.org/opendj/trunk@9539 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • cb8a57ec   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Fixed nightly test org.opends.server.replication.server.ExternalChangeLogTest#ECLReplicationServerFullTest14 broken by r9505.

r9505 allowed code to throw ChangelogException and removed several useless catch(), in particular, a catch was removed from DraftCNDbHandler's methods getPreviousCookie(), getCSN(), getBaseDN() which were predecessors of getRecord().
Older code was throwing an exception, then catching it and returning null in some places while in other places, the exception was allowed to propagate.
The final change removed the unnecessary exception throwing and swallowing where it was useless. The exception is now thrown again where it is useful.


DraftCNDB.java:
In DraftCNDBCursor(long) ctor, removed throwing the exception and return an empty cursor instead.

DraftCNDbIterator.java:
In DraftCNDbIterator() ctor, throw an exception when the cursor is empty.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9538 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • c52ebf59   OPENDJ-1130 (CR-2323) Connect Error when stopping all the servers from a replica… ... Browse Dir » 
    …tion topology at the same time

Properly marked the state of the thread + checked it from the deeper DbHandler.trim() to ensure the thread stops as fast as possible. DB reentrant locsk then ensure the threads properly wait on each other before shutdown.

DirectoryThread.java:
Added ThreadState enum + a threadState AtomicReference instance field.
Added isShutdownInitiated(), initiateShutdown(), startWork(), stopWork(), setThreadStateIfNotShuttingDown(), getThreadState().
Converted comments to javadocs.
In uncaughtException(), do not log ThreadDeath error (coming from Ludo, suggested as part of OPENDJ-1061).

DbHandler.java:
Removed shutdown and done instance fields (replaced by the DirectoryThread.threadState). The done instance field had an ill defined purpose and its usefulness was questionable.
In shutdown(), used DirectoryThread thread state management methods + removed dead code.
In run() and trim(), used DirectoryThread thread state management methods.


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

16 Sep, 2013

2 commits

13 Sep, 2013

2 commits

07 Sep, 2013

1 commit

06 Sep, 2013

5 commits

  • e3316195   OPENDJ-1116 Introduce abstraction for the changelog DB ... Browse Dir » 
    Added ChangelogDB interface to abstract all the remaining code away from JE.



ChangelogDB.java, ChangelogState.java, Pair.java: ADDED

JEChangelogDB.java: ADDED
Created from code in ReplicationServer and ReplicationServerDomain.


ReplicationServer.java:
Moved a lot of code to JEChangelogDB.
Added ChangelogDB field and delegated existing method calls to it.
Added getChangelogDB().
Made getChangeNumberIndexDB() package protected for the tests.

ReplicationServerDomain.java:
Moved a lot of code to JEChangelogDB.
Replaced sourceDbHandlers field with ChangelogDB field.
Renamed publishMessage() to publishUpdateMsg().
FIXME!!!! Bug: generationIdSavedStatus is not protected by synchronized (sourceDbHandlers) !!!!!

ReplicationDbEnv.java:
Changed void initializeFromChangelogStateDB() to ChangelogState readChangelogState()


ExternalChangeLogTest.java:
Moved from package org.opends.server.replication to org.opends.server.replication.server.
Extracted method getReplicationDomainStartState()

ChangelogException.java:
Changed one ctor visibility to public.

git-svn-id: https://svn.forgerock.org/opendj/trunk@9524 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • d888c723   CR-2281 Fix for OPENDJ-1021: Remove obsolete opendj/bin/README_Windows.txt ... Browse Dir » 
    git-svn-id: https://svn.forgerock.org/opendj/trunk@9523 41b1ffd8-f28e-4786-ab96-9950f0a78031
    mark
     
  • 8e6473f5   ReplicationServerDomain.java: ... Browse Dir » 
    Removed unused getGenerationIdSavedStatus().
Removed savedStatus parameter from changeGenerationId() and defaulted it to false since all callers were calling it with false.

DataServerHandler.java, ReplicationServerHandler.java, ServerHandler.java:
Consequence of the change to ReplicationServerDomain.changeGenerationId().

git-svn-id: https://svn.forgerock.org/opendj/trunk@9522 41b1ffd8-f28e-4786-ab96-9950f0a78031
    JnRouvignac
     
  • 88738470   Fix OPENDJ-1127: Replication server reconnect thread consumes too much CPU ... Browse Dir » 
    * fix JDK6 build - InetAddress.getLoopbackAddress() is JDK7 only.


git-svn-id: https://svn.forgerock.org/opendj/trunk@9521 41b1ffd8-f28e-4786-ab96-9950f0a78031
    matthew
     
  • cdf24645   Fix OPENDJ-1127: Replication server reconnect thread consumes too much CPU ... Browse Dir » 
    * cache network listener enumeration results for 30s
* streamline connect thread URL iteration.


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