Return-Path: X-Original-To: apmail-directory-dev-archive@www.apache.org Delivered-To: apmail-directory-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E19C1E732 for ; Thu, 30 May 2013 15:17:49 +0000 (UTC) Received: (qmail 24648 invoked by uid 500); 30 May 2013 15:17:49 -0000 Delivered-To: apmail-directory-dev-archive@directory.apache.org Received: (qmail 24443 invoked by uid 500); 30 May 2013 15:17:49 -0000 Mailing-List: contact dev-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Apache Directory Developers List" Delivered-To: mailing list dev@directory.apache.org Received: (qmail 24418 invoked by uid 99); 30 May 2013 15:17:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 May 2013 15:17:48 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of ayyagarikiran@gmail.com designates 209.85.217.174 as permitted sender) Received: from [209.85.217.174] (HELO mail-lb0-f174.google.com) (209.85.217.174) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 May 2013 15:17:44 +0000 Received: by mail-lb0-f174.google.com with SMTP id u10so673953lbi.5 for ; Thu, 30 May 2013 08:17:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=1xn8R1tgSmgMA+T1CX7fMT7CwkC3/hp5eU2QfThUWYM=; b=RprNdH1QLzYrtnohsKLpNolM6/RqWmF6PG0KUHnh9YYmSayw62VyWvyu/D88StmLqj zSHVDUUCf5/y6xevmYbPYvItMnEo1W5nlEUNfXNIiBXWSFJg6hR+pIDf6tWKLjpwSxts olHnSPz6U+o5xFxPo5HhPWP17BKPWs3ERhVx7mb/Jd+8LA6mjDcj4xyDfLBj0jClsa1j irVkqqcPekEUG5Y0f/LzWLhq4OCMCZ16hR9k0xEoEdn6fzba6DA1fFiY1KJrPiX8sCgV wEfJRBWm7gvkWKl6EQNqrZLnLxijc1XIm9/yGUu36DGY6jgCchGEg+jR8HwJSCo7WDac IGnQ== MIME-Version: 1.0 X-Received: by 10.112.138.228 with SMTP id qt4mr3810264lbb.106.1369927042760; Thu, 30 May 2013 08:17:22 -0700 (PDT) Sender: ayyagarikiran@gmail.com Received: by 10.114.199.177 with HTTP; Thu, 30 May 2013 08:17:22 -0700 (PDT) In-Reply-To: <51A69B1E.1000908@gmail.com> References: <20130528050740.15DEE23888E7@eris.apache.org> <51A69B1E.1000908@gmail.com> Date: Thu, 30 May 2013 20:47:22 +0530 X-Google-Sender-Auth: GM50idKkdf98WW-81RbyCa2eZT4 Message-ID: Subject: Re: svn commit: r1486738 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java From: Kiran Ayyagari To: Apache Directory Developers List Content-Type: multipart/alternative; boundary=089e0112bfd0c084e204ddf0fe93 X-Virus-Checked: Checked by ClamAV on apache.org --089e0112bfd0c084e204ddf0fe93 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Thu, May 30, 2013 at 5:49 AM, Emmanuel L=E9charny w= rote: > I'm afraid this commit breaks the build... > > my bad, my test-run didn't catch this and on a second thought this is not required, I have reverted the offending code in the commit 1487891 > This is what I now get when I run the > ClientServerReplicationI.testModify() test : > > -----------> Dumping the server <----------- > -----------> Looking for > > 2.5.4.3=3Duser14,0.9.2342.19200300.100.1.25=3Dexample,0.9.2342.19200300.1= 00.1.25=3Dcom > <----------- > Entry > > 2.5.4.3=3Duser1renamedmovedandrenamed,0.9.2342.19200300.100.1.25=3Dexampl= e,0.9.2342.19200300.100.1.25=3Dcom > exists, entrtyUuid =3D entryUUID: 9a381ea9-85e5-4d1c-990a-4daa437eda68 > > Entry > > 2.5.4.3=3Duser12,0.9.2342.19200300.100.1.25=3Dexample,0.9.2342.19200300.1= 00.1.25=3Dcom > exists, entrtyUuid =3D entryUUID: 1f61ad18-09b6-4518-b833-4365c2faf50a > > Entry 0.9.2342.19200300.100.1.25=3Dexample,0.9.2342.19200300.100.1.25=3Dc= om > exists, entrtyUuid =3D entryUUID: 868c28b8-5e07-4503-99a7-4d7bbf0b8628 > > The searched entry exists !!! > found Entry > > 2.5.4.3=3Duser14,0.9.2342.19200300.100.1.25=3Dexample,0.9.2342.19200300.1= 00.1.25=3Dcom > exists, entrtyUuid =3D entryUUID: c351bd92-0397-4fa9-afef-b62ac95430d3 > > -----------> Dump done <----------- > > If I revert it, the test is passing... > > I wonder if the fact that we don't sae the cookie is the cause of this > failure ? > > > Le 5/28/13 7:07 AM, kayyagari@apache.org a =E9crit : > > Author: kayyagari > > Date: Tue May 28 05:07:39 2013 > > New Revision: 1486738 > > I > > URL: http://svn.apache.org/r1486738 > > Log: > > o replicate createTimestamp and creatorsName attributes > > o cleaned up connectionClosed() > > > > Modified: > > > directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory= /server/ldap/replication/consumer/ReplicationConsumerImpl.java > > > > Modified: > directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory= /server/ldap/replication/consumer/ReplicationConsumerImpl.java > > URL: > http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/m= ain/java/org/apache/directory/server/ldap/replication/consumer/ReplicationC= onsumerImpl.java?rev=3D1486738&r1=3D1486737&r2=3D1486738&view=3Ddiff > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- > directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory= /server/ldap/replication/consumer/ReplicationConsumerImpl.java > (original) > > +++ > directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory= /server/ldap/replication/consumer/ReplicationConsumerImpl.java > Tue May 28 05:07:39 2013 > > @@ -126,7 +126,7 @@ public class ReplicationConsumerImpl imp > > private SchemaManager schemaManager; > > > > /** flag to indicate whether the consumer was disconnected */ > > - private boolean disconnected; > > + private volatile boolean disconnected; > > > > /** the core session */ > > private CoreSession session; > > @@ -136,8 +136,6 @@ public class ReplicationConsumerImpl imp > > { > > SchemaConstants.ENTRY_UUID_AT, > > SchemaConstants.ENTRY_DN_AT, > > - SchemaConstants.CREATE_TIMESTAMP_AT, > > - SchemaConstants.CREATORS_NAME_AT, > > SchemaConstants.ENTRY_PARENT_ID_AT, > > SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT > > }; > > @@ -539,17 +537,7 @@ public class ReplicationConsumerImpl imp > > config.getProducer() ); > > } > > > > - // Cleanup > > - disconnected =3D true; > > - connection =3D null; > > - > > - // persist the cookie > > - storeCookie(); > > - > > - // reset the cookie > > - syncCookie =3D null; > > - > > - return; > > + disconnect(); > > } > > > > > > > > > > > -- > Regards, > Cordialement, > Emmanuel L=E9charny > www.iktek.com > > --=20 Kiran Ayyagari http://keydap.com --089e0112bfd0c084e204ddf0fe93 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable



On Thu, May 30, 2013 at 5:49 AM, Emmanuel L=E9charny <elecharny@= gmail.com> wrote:
I'm afraid this commi= t breaks the build...

my bad, my test-run didn't catch this and on a se= cond thought this is not required, I have reverted the offending code
in the commit 1487891
This is what I now get when I run the
ClientServerReplicationI.testModify() test :

-----------> Dumping the server <-----------
-----------> Looking for
2.5.4.3=3Duser14,0.9.2342.19200300.100.1.25=3Dexample,0.9.2342.19200300.100= .1.25=3Dcom
<-----------
Entry
2.5.4.3=3Duser1renamedmovedandrenamed,0.9.2342.19200300.100.1.25=3Dexample,= 0.9.2342.19200300.100.1.25=3Dcom
exists, entrtyUuid =3D entryUUID: 9a381ea9-85e5-4d1c-990a-4daa437eda68

Entry
2.5.4.3=3Duser12,0.9.2342.19200300.100.1.25=3Dexample,0.9.2342.19200300.100= .1.25=3Dcom
exists, entrtyUuid =3D entryUUID: 1f61ad18-09b6-4518-b833-4365c2faf50a

Entry 0.9.2342.19200300.100.1.25=3Dexample,0.9.2342.19200300.100.1.25=3Dcom=
exists, entrtyUuid =3D entryUUID: 868c28b8-5e07-4503-99a7-4d7bbf0b8628

The searched entry exists !!!
found Entry
2.5.4.3=3Duser14,0.9.2342.19200300.100.1.25=3Dexample,0.9.2342.19200300.100= .1.25=3Dcom
exists, entrtyUuid =3D entryUUID: c351bd92-0397-4fa9-afef-b62ac95430d3

-----------> Dump done <-----------

If I revert it, the test is passing...

I wonder if the fact that we don't sae the cookie is the cause of this<= br> failure ?


Le 5/28/13 7:07 AM, kayyagari@apach= e.org a =E9crit :
> Author: kayyagari
> Date: Tue May 28 05:07:39 2013
> New Revision: 1486738
> I
> URL: http://svn.apache.org/r1486738
> Log:
> o replicate createTimestamp and creatorsName attributes
> o cleaned up connectionClosed()
>
> Modified:
> =A0 =A0 directory/apacheds/trunk/protocol-ldap/src/main/java/org/apach= e/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java >
> Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apa= che/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java=
> URL: http://svn.apache.org/viewvc/= directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/s= erver/ldap/replication/consumer/ReplicationConsumerImpl.java?rev=3D1486738&= amp;r1=3D1486737&r2=3D1486738&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D
> --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/di= rectory/server/ldap/replication/consumer/ReplicationConsumerImpl.java (orig= inal)
> +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/di= rectory/server/ldap/replication/consumer/ReplicationConsumerImpl.java Tue M= ay 28 05:07:39 2013
> @@ -126,7 +126,7 @@ public class ReplicationConsumerImpl imp
> =A0 =A0 =A0private SchemaManager schemaManager;
>
> =A0 =A0 =A0/** flag to indicate whether the consumer was disconnected = */
> - =A0 =A0private boolean disconnected;
> + =A0 =A0private volatile boolean disconnected;
>
> =A0 =A0 =A0/** the core session */
> =A0 =A0 =A0private CoreSession session;
> @@ -136,8 +136,6 @@ public class ReplicationConsumerImpl imp
> =A0 =A0 =A0 =A0 =A0{
> =A0 =A0 =A0 =A0 =A0 =A0 =A0SchemaConstants.ENTRY_UUID_AT,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0SchemaConstants.ENTRY_DN_AT,
> - =A0 =A0 =A0 =A0 =A0 =A0SchemaConstants.CREATE_TIMESTAMP_AT,
> - =A0 =A0 =A0 =A0 =A0 =A0SchemaConstants.CREATORS_NAME_AT,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0SchemaConstants.ENTRY_PARENT_ID_AT,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENT= RIES_AT
> =A0 =A0 =A0};
> @@ -539,17 +537,7 @@ public class ReplicationConsumerImpl imp
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0config.getProducer() );
> =A0 =A0 =A0 =A0 =A0}
>
> - =A0 =A0 =A0 =A0// Cleanup
> - =A0 =A0 =A0 =A0disconnected =3D true;
> - =A0 =A0 =A0 =A0connection =3D null;
> -
> - =A0 =A0 =A0 =A0// persist the cookie
> - =A0 =A0 =A0 =A0storeCookie();
> -
> - =A0 =A0 =A0 =A0// reset the cookie
> - =A0 =A0 =A0 =A0syncCookie =3D null;
> -
> - =A0 =A0 =A0 =A0return;
> + =A0 =A0 =A0 =A0disconnect();
> =A0 =A0 =A0}
>
>
>
>


--
Regards,
Cordialement,
Emmanuel L=E9charny
www.iktek.com




--
Kiran Ayy= agari
http://keydap.com<= /a>
--089e0112bfd0c084e204ddf0fe93--