You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@aurora.apache.org by John Sirois <js...@apache.org> on 2016/04/14 00:18:55 UTC

Review Request 46171: Centralize ZooKeeper configuration in discovery.

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46171/
-----------------------------------------------------------

Review request for Aurora, Bill Farner and Zameer Manji.


Bugs: AURORA-1468
    https://issues.apache.org/jira/browse/AURORA-1468


Repository: aurora


Description
-------

This moves `ZooKeeperClient` configuration to the discovery package and
factors `ZooKeeperConfig` up out of the `ZooKeeperClientModule`
for re-use as ZooKeeper config data by Curator.

 config/legacy_untested_classes.txt                                                                                                           | 14 ++++----
 src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java                                                                             | 10 +++---
 src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client/flagged/FlaggedClientConfig.java => discovery/FlaggedZooKeeperConfig.java} | 14 ++++----
 src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client => discovery}/ZooKeeperClientModule.java                                   | 84 ++++----------------------------------------
 src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java                                                                     | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java                                                                | 12 ++++---
 src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java                                                                               |  6 ++--
 src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java                                                                 | 79 ++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 210 insertions(+), 103 deletions(-)


Diffs
-----

  config/legacy_untested_classes.txt 00e166690401dd773f1dcae1ef10ac59f73d74ed 
  src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 6c7ae7e66770fd766ef41f86501e08310a6bc698 
  src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java PRE-CREATION 
  src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java b20ea5da59152b0f71cf593efebcbc796a5632aa 
  src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/ZooKeeperClientModule.java cab3691dc4b1cbc9c4cb18153f483262ccf7c8da 
  src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/flagged/FlaggedClientConfig.java 92f367319eb8cbf516790ca4c4aec2ce0e5dce22 
  src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java 88d3e3e18a73a086f1579bb50c4d39b1ec5a00e8 
  src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java PRE-CREATION 

Diff: https://reviews.apache.org/r/46171/diff/


Testing
-------

Locally green:
```
./gradlew -Pq build
./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
```


Thanks,

John Sirois


Re: Review Request 46171: Centralize ZooKeeper configuration in discovery.

Posted by Bill Farner <wf...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46171/#review128785
-----------------------------------------------------------


Ship it!




Ship It!

- Bill Farner


On April 13, 2016, 3:18 p.m., John Sirois wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46171/
> -----------------------------------------------------------
> 
> (Updated April 13, 2016, 3:18 p.m.)
> 
> 
> Review request for Aurora, Bill Farner and Zameer Manji.
> 
> 
> Bugs: AURORA-1468
>     https://issues.apache.org/jira/browse/AURORA-1468
> 
> 
> Repository: aurora
> 
> 
> Description
> -------
> 
> This moves `ZooKeeperClient` configuration to the discovery package and
> factors `ZooKeeperConfig` up out of the `ZooKeeperClientModule`
> for re-use as ZooKeeper config data by Curator.
> 
>  config/legacy_untested_classes.txt                                                                                                           | 14 ++++----
>  src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java                                                                             | 10 +++---
>  src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client/flagged/FlaggedClientConfig.java => discovery/FlaggedZooKeeperConfig.java} | 14 ++++----
>  src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client => discovery}/ZooKeeperClientModule.java                                   | 84 ++++----------------------------------------
>  src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java                                                                     | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java                                                                | 12 ++++---
>  src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java                                                                               |  6 ++--
>  src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java                                                                 | 79 ++++++++++++++++++++++++++++++++++++++++++
>  8 files changed, 210 insertions(+), 103 deletions(-)
> 
> 
> Diffs
> -----
> 
>   config/legacy_untested_classes.txt 00e166690401dd773f1dcae1ef10ac59f73d74ed 
>   src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 6c7ae7e66770fd766ef41f86501e08310a6bc698 
>   src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java PRE-CREATION 
>   src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java b20ea5da59152b0f71cf593efebcbc796a5632aa 
>   src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/ZooKeeperClientModule.java cab3691dc4b1cbc9c4cb18153f483262ccf7c8da 
>   src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/flagged/FlaggedClientConfig.java 92f367319eb8cbf516790ca4c4aec2ce0e5dce22 
>   src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java 88d3e3e18a73a086f1579bb50c4d39b1ec5a00e8 
>   src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46171/diff/
> 
> 
> Testing
> -------
> 
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
> 
> 
> Thanks,
> 
> John Sirois
> 
>


Re: Review Request 46171: Centralize ZooKeeper configuration in discovery.

Posted by Zameer Manji <zm...@apache.org>.

> On April 14, 2016, 6:54 p.m., John Sirois wrote:
> > @zmanji - friendly ping - I have the last RB adding a `-zk_use_curator` flag ready to post, but this needs to hit master 1st.

Sorry for the delay, this slipped through the cracks.


- Zameer


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46171/#review129056
-----------------------------------------------------------


On April 13, 2016, 3:18 p.m., John Sirois wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46171/
> -----------------------------------------------------------
> 
> (Updated April 13, 2016, 3:18 p.m.)
> 
> 
> Review request for Aurora, Bill Farner and Zameer Manji.
> 
> 
> Bugs: AURORA-1468
>     https://issues.apache.org/jira/browse/AURORA-1468
> 
> 
> Repository: aurora
> 
> 
> Description
> -------
> 
> This moves `ZooKeeperClient` configuration to the discovery package and
> factors `ZooKeeperConfig` up out of the `ZooKeeperClientModule`
> for re-use as ZooKeeper config data by Curator.
> 
>  config/legacy_untested_classes.txt                                                                                                           | 14 ++++----
>  src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java                                                                             | 10 +++---
>  src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client/flagged/FlaggedClientConfig.java => discovery/FlaggedZooKeeperConfig.java} | 14 ++++----
>  src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client => discovery}/ZooKeeperClientModule.java                                   | 84 ++++----------------------------------------
>  src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java                                                                     | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java                                                                | 12 ++++---
>  src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java                                                                               |  6 ++--
>  src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java                                                                 | 79 ++++++++++++++++++++++++++++++++++++++++++
>  8 files changed, 210 insertions(+), 103 deletions(-)
> 
> 
> Diffs
> -----
> 
>   config/legacy_untested_classes.txt 00e166690401dd773f1dcae1ef10ac59f73d74ed 
>   src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 6c7ae7e66770fd766ef41f86501e08310a6bc698 
>   src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java PRE-CREATION 
>   src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java b20ea5da59152b0f71cf593efebcbc796a5632aa 
>   src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/ZooKeeperClientModule.java cab3691dc4b1cbc9c4cb18153f483262ccf7c8da 
>   src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/flagged/FlaggedClientConfig.java 92f367319eb8cbf516790ca4c4aec2ce0e5dce22 
>   src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java 88d3e3e18a73a086f1579bb50c4d39b1ec5a00e8 
>   src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46171/diff/
> 
> 
> Testing
> -------
> 
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
> 
> 
> Thanks,
> 
> John Sirois
> 
>


Re: Review Request 46171: Centralize ZooKeeper configuration in discovery.

Posted by John Sirois <js...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46171/#review129056
-----------------------------------------------------------



@zmanji - friendly ping - I have the last RB adding a `-zk_use_curator` flag ready to post, but this needs to hit master 1st.

- John Sirois


On April 13, 2016, 4:18 p.m., John Sirois wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46171/
> -----------------------------------------------------------
> 
> (Updated April 13, 2016, 4:18 p.m.)
> 
> 
> Review request for Aurora, Bill Farner and Zameer Manji.
> 
> 
> Bugs: AURORA-1468
>     https://issues.apache.org/jira/browse/AURORA-1468
> 
> 
> Repository: aurora
> 
> 
> Description
> -------
> 
> This moves `ZooKeeperClient` configuration to the discovery package and
> factors `ZooKeeperConfig` up out of the `ZooKeeperClientModule`
> for re-use as ZooKeeper config data by Curator.
> 
>  config/legacy_untested_classes.txt                                                                                                           | 14 ++++----
>  src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java                                                                             | 10 +++---
>  src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client/flagged/FlaggedClientConfig.java => discovery/FlaggedZooKeeperConfig.java} | 14 ++++----
>  src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client => discovery}/ZooKeeperClientModule.java                                   | 84 ++++----------------------------------------
>  src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java                                                                     | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java                                                                | 12 ++++---
>  src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java                                                                               |  6 ++--
>  src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java                                                                 | 79 ++++++++++++++++++++++++++++++++++++++++++
>  8 files changed, 210 insertions(+), 103 deletions(-)
> 
> 
> Diffs
> -----
> 
>   config/legacy_untested_classes.txt 00e166690401dd773f1dcae1ef10ac59f73d74ed 
>   src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 6c7ae7e66770fd766ef41f86501e08310a6bc698 
>   src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java PRE-CREATION 
>   src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java b20ea5da59152b0f71cf593efebcbc796a5632aa 
>   src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/ZooKeeperClientModule.java cab3691dc4b1cbc9c4cb18153f483262ccf7c8da 
>   src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/flagged/FlaggedClientConfig.java 92f367319eb8cbf516790ca4c4aec2ce0e5dce22 
>   src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java 88d3e3e18a73a086f1579bb50c4d39b1ec5a00e8 
>   src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46171/diff/
> 
> 
> Testing
> -------
> 
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
> 
> 
> Thanks,
> 
> John Sirois
> 
>


Re: Review Request 46171: Centralize ZooKeeper configuration in discovery.

Posted by Zameer Manji <zm...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46171/#review129162
-----------------------------------------------------------


Ship it!




Ship It!

- Zameer Manji


On April 13, 2016, 3:18 p.m., John Sirois wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46171/
> -----------------------------------------------------------
> 
> (Updated April 13, 2016, 3:18 p.m.)
> 
> 
> Review request for Aurora, Bill Farner and Zameer Manji.
> 
> 
> Bugs: AURORA-1468
>     https://issues.apache.org/jira/browse/AURORA-1468
> 
> 
> Repository: aurora
> 
> 
> Description
> -------
> 
> This moves `ZooKeeperClient` configuration to the discovery package and
> factors `ZooKeeperConfig` up out of the `ZooKeeperClientModule`
> for re-use as ZooKeeper config data by Curator.
> 
>  config/legacy_untested_classes.txt                                                                                                           | 14 ++++----
>  src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java                                                                             | 10 +++---
>  src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client/flagged/FlaggedClientConfig.java => discovery/FlaggedZooKeeperConfig.java} | 14 ++++----
>  src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client => discovery}/ZooKeeperClientModule.java                                   | 84 ++++----------------------------------------
>  src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java                                                                     | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java                                                                | 12 ++++---
>  src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java                                                                               |  6 ++--
>  src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java                                                                 | 79 ++++++++++++++++++++++++++++++++++++++++++
>  8 files changed, 210 insertions(+), 103 deletions(-)
> 
> 
> Diffs
> -----
> 
>   config/legacy_untested_classes.txt 00e166690401dd773f1dcae1ef10ac59f73d74ed 
>   src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 6c7ae7e66770fd766ef41f86501e08310a6bc698 
>   src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java PRE-CREATION 
>   src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java b20ea5da59152b0f71cf593efebcbc796a5632aa 
>   src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/ZooKeeperClientModule.java cab3691dc4b1cbc9c4cb18153f483262ccf7c8da 
>   src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/flagged/FlaggedClientConfig.java 92f367319eb8cbf516790ca4c4aec2ce0e5dce22 
>   src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java 88d3e3e18a73a086f1579bb50c4d39b1ec5a00e8 
>   src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46171/diff/
> 
> 
> Testing
> -------
> 
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
> 
> 
> Thanks,
> 
> John Sirois
> 
>


Re: Review Request 46171: Centralize ZooKeeper configuration in discovery.

Posted by Aurora ReviewBot <wf...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46171/#review128780
-----------------------------------------------------------


Ship it!




Master (8d0473c) is green with this patch.
  ./build-support/jenkins/build.sh

I will refresh this build result if you post a review containing "@ReviewBot retry"

- Aurora ReviewBot


On April 13, 2016, 10:18 p.m., John Sirois wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46171/
> -----------------------------------------------------------
> 
> (Updated April 13, 2016, 10:18 p.m.)
> 
> 
> Review request for Aurora, Bill Farner and Zameer Manji.
> 
> 
> Bugs: AURORA-1468
>     https://issues.apache.org/jira/browse/AURORA-1468
> 
> 
> Repository: aurora
> 
> 
> Description
> -------
> 
> This moves `ZooKeeperClient` configuration to the discovery package and
> factors `ZooKeeperConfig` up out of the `ZooKeeperClientModule`
> for re-use as ZooKeeper config data by Curator.
> 
>  config/legacy_untested_classes.txt                                                                                                           | 14 ++++----
>  src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java                                                                             | 10 +++---
>  src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client/flagged/FlaggedClientConfig.java => discovery/FlaggedZooKeeperConfig.java} | 14 ++++----
>  src/main/java/org/apache/aurora/scheduler/{zookeeper/guice/client => discovery}/ZooKeeperClientModule.java                                   | 84 ++++----------------------------------------
>  src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java                                                                     | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java                                                                | 12 ++++---
>  src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java                                                                               |  6 ++--
>  src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java                                                                 | 79 ++++++++++++++++++++++++++++++++++++++++++
>  8 files changed, 210 insertions(+), 103 deletions(-)
> 
> 
> Diffs
> -----
> 
>   config/legacy_untested_classes.txt 00e166690401dd773f1dcae1ef10ac59f73d74ed 
>   src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 6c7ae7e66770fd766ef41f86501e08310a6bc698 
>   src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java PRE-CREATION 
>   src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java b20ea5da59152b0f71cf593efebcbc796a5632aa 
>   src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/ZooKeeperClientModule.java cab3691dc4b1cbc9c4cb18153f483262ccf7c8da 
>   src/main/java/org/apache/aurora/scheduler/zookeeper/guice/client/flagged/FlaggedClientConfig.java 92f367319eb8cbf516790ca4c4aec2ce0e5dce22 
>   src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java 88d3e3e18a73a086f1579bb50c4d39b1ec5a00e8 
>   src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/46171/diff/
> 
> 
> Testing
> -------
> 
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
> 
> 
> Thanks,
> 
> John Sirois
> 
>