ericlee123 opened a new pull request #924: [AdminPU] Port unification for Jetty admin server URL: https://github.com/apache/zookeeper/pull/924 Summary: Jetty does not have support for port unification. Subclassing of some Java networking libraries is necessary for ZooKeeper to serve both HTTP and HTTPS traffic on the same port. Note: The traffic is encrypted, but the authentication isn't right because the certificates are not set up correctly for HTTP requests. This will be fixed soon. Test Plan: ``` [ericlee123 @ ~/zookeeper] (admin-PU) > ant -Dtestcase=JettyAdminServerTest test-core-java ... junit.run-concurrent: [echo] Running 1 concurrent JUnit processes. [junit] Running org.apache.zookeeper.server.admin.JettyAdminServerTest [junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.394 sec fail.build.on.test.failure: junit.run: test-core-java: BUILD SUCCESSFUL Total time: 9 seconds ``` OR For a more involved integration test: (need to pass `zookeeper.admin.portUnification` flag) 1. Run `fbpkg build --ephemeral fb-zeus-server-tw` 2. Push the ephemeral package to a ZoTW ensemble. ` TW_PUSHED_VERSION='fb-zeus-server-tw:<ephemeral-id>' tw update ~/configerator/source/zeus/tw/zeus.tw <TW-job-handle> ` 3. Once a task returns to some green state (light or dark), access it with `tw ssh <TW-task-handle>` 4. Try both HTTP and HTTPS connections. :) :) :) `curl http://localhost:3191/commands` OR `curl -k https://localhost:3191/commands` Reviewers: nixon, bunn, arushiagg Reviewed By: nixon Subscribers: nixon, ilyam, ayossef, anitazha, [email protected] Differential Revision: https://phabricator.intern.facebook.com/D13007834 Tasks: T31843862 Signature: 13007834:1544747909:47ba138e516587006cfe864b244aa651d564c8e0 reduce log level of AdminServer connection factory Summary: This is being printed to often - given our usual settings. Demoting to debug so we can still find it if necessary. Test Plan: visual inspection Reviewers: arushiagg, ericlee123 Reviewed By: arushiagg Subscribers: #zeus, [email protected] Differential Revision: https://phabricator.intern.facebook.com/D13737154 Tasks: T39281571 Signature: 13737154:1547841253:07ce0a158e4662369174bc4a0a4f23fbe812a829 [jetty admin] use try-with-resources on X509Util in JettyAdminServer and test Summary: Now that X509Util implements Closeable, use it in a try-with-resources block Test Plan: `ant -Dtestcase=JettyAdminServerTest test-core-java` Reviewers: nixon, ericlee123 Reviewed By: nixon Subscribers: nixon, dongw, [email protected] Differential Revision: https://phabricator.intern.facebook.com/D13723056 Signature: 13723056:1548357643:7a475d09ebddaf136bfccef319860e77df177e1f [jetty admin] code cleanup: use X509TestContext helpers in unit test Summary: Use X509TestContext.setSystemProperties() and X509TestContext.clearSystemProperties() instead of setting them by hand. Test Plan: `ant -Dtestcase=JettyAdminServerTest test-core-java` Reviewers: nixon, ericlee123 Reviewed By: nixon Subscribers: nixon, dongw, [email protected] Differential Revision: https://phabricator.intern.facebook.com/D13723151 Signature: 13723151:1548182905:0e1cfcc24f6a9efb30418c109e14dc50e087bb5c
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
