Re: Can't merge master into 3.0

2016-02-05 Thread Scott Blum
Yes, I confirmed this works on your watcher rework branch. (Nothing I was able to hack on CURATOR-3.0 would make it pass, probably due to collection element equality/hashcode issues with wrapping in a spot I wasn't able to find.) On Fri, Feb 5, 2016 at 11:31 AM, Scott Blum wrote: > Ahh.. super

Re: Can't merge master into 3.0

2016-02-05 Thread Scott Blum
Ahh.. super slick. So recipes no longer have to remove watches on deleted nodes, the framework does it for you. On Fri, Feb 5, 2016 at 9:46 AM, Jordan Zimmerman wrote: > The error is occurring because of this line in wasDeleted(): > > > client.watches().remove(this).ofType(WatcherType.Any).loca

Re: Can't merge master into 3.0

2016-02-05 Thread Jordan Zimmerman
The error is occurring because of this line in wasDeleted(): client.watches().remove(this).ofType(WatcherType.Any).locally().inBackground().forPath(path); I believe this is unnecessary as the WatcherRemoveCuratorFramework handles it automatically. If I remove this line the log errors go away.

Re: Can't merge master into 3.0

2016-02-03 Thread Scott Blum
TestTreeCache.testBasics() fails during teardown on CURATOR-3.0 (4e4072b) On Wed, Feb 3, 2016 at 7:21 PM, Jordan Zimmerman wrote: > Scott, do you have a small test that shows this error? I’d really like to > fix it and can’t get a reproducible case. > > -Jordan > > On Feb 1, 2016, at 3:14 PM, Sc

Re: Can't merge master into 3.0

2016-02-03 Thread Jordan Zimmerman
Scott, do you have a small test that shows this error? I’d really like to fix it and can’t get a reproducible case. -Jordan > On Feb 1, 2016, at 3:14 PM, Scott Blum wrote: > > Alright, I've git bisected it down to a single change that breaks > TestTreeCache: > > WatcherRemovalManager.interna

Re: Can't merge master into 3.0

2016-02-01 Thread Scott Blum
I went ahead and pushed CURATOR-3.0 since the the new code doesn't make anything worse and the bug already existed. On Mon, Feb 1, 2016 at 3:15 PM, Scott Blum wrote: > BTW, I'd be happy to dig into this more, but I'd need a "theory of > operation" around WatcherRemovalManager. I don't know what

Re: Can't merge master into 3.0

2016-02-01 Thread Scott Blum
BTW, I'd be happy to dig into this more, but I'd need a "theory of operation" around WatcherRemovalManager. I don't know what it's supposed to do exactly. On Mon, Feb 1, 2016 at 3:13 PM, Jordan Zimmerman wrote: > Yeah - I know about those. I’m going to write a JIra for it today. > > On Feb 1, 2

Re: Can't merge master into 3.0

2016-02-01 Thread Scott Blum
Alright, I've git bisected it down to a single change that breaks TestTreeCache: WatcherRemovalManager.internalRemove, private synchronized void internalRemove(WrappedWatcher entry) { namespaceWatcherMap.removeWatcher(entry.watcher); entries.remove(entry); } The offending line seems to b

Re: Can't merge master into 3.0

2016-02-01 Thread Jordan Zimmerman
Yeah - I know about those. I’m going to write a JIra for it today. > On Feb 1, 2016, at 3:05 PM, Scott Blum wrote: > > I think there may be some general problem, I notice warning messages in the > test logs, like: > > ERROR org.apache.zookeeper.ClientCnxn Failed to find watcher! > [main-Send

Re: Can't merge master into 3.0

2016-02-01 Thread Scott Blum
I think there may be some general problem, I notice warning messages in the test logs, like: ERROR org.apache.zookeeper.ClientCnxn Failed to find watcher! [main-SendThread(127.0.0.1:60086)] org.apache.zookeeper.KeeperException$NoWatcherException: KeeperErrorCode = No such watcher for /test/one at

Re: Can't merge master into 3.0

2016-02-01 Thread Scott Blum
Actually, it's not a problem with the changes I'm trying to merge in; TestTreeCache is currently broken on 3.0 branch already. Looks like it broke on revision c6a22ba508f9227fe1c657f93e3cc77d8bc17e3e, which was a merge from master into 3.0, with some conflict resolution. On Mon, Feb 1, 2016 at 2:

Re: Can't merge master into 3.0

2016-02-01 Thread Jordan Zimmerman
I can try to merge when I get a chance. At some point, we should move CURATOR-3.0 to master so we don’t have to keep maintaining this. -JZ > On Feb 1, 2016, at 2:38 PM, Scott Blum wrote: > > TestTreeCache fails on 6acf0987125469ecb79ff48ce5e9735a98cd1abb >

Can't merge master into 3.0

2016-02-01 Thread Scott Blum
TestTreeCache fails on 6acf0987125469ecb79ff48ce5e9735a98cd1abb , a proposed merge of master into 3.0. It has something to do with the new watcher stuff, but I haven't been able to figure out what the problem is, possible because I do