sekikn commented on PR #995: URL: https://github.com/apache/bigtop/pull/995#issuecomment-1243073981
+1 LGTM. I confirmed that there's no problematic difference between the original and the patched versions, without the `-PparentDir` option. ``` $ ./gradlew zookeeper-clean zookeeper-pkg $ mv output/zookeeper ~ $ curl -sL https://github.com/apache/bigtop/pull/995.patch | git apply $ ./gradlew zookeeper-clean zookeeper-pkg $ for i in $(ls output/zookeeper/x86_64); do diff <(rpm -qlp output/zookeeper/x86_64/$i) <(rpm -qlp ~/zookeeper/x86_64/$i); done 2d1 < /etc/zookeeper 3,8c3,8 < /usr/lib/debug/.build-id/14 < /usr/lib/debug/.build-id/14/edc5f1dcfaffcaa714524d9732d8c5a1352dc6 < /usr/lib/debug/.build-id/14/edc5f1dcfaffcaa714524d9732d8c5a1352dc6.debug < /usr/lib/debug/.build-id/33 < /usr/lib/debug/.build-id/33/2d47f0bc8e4aeac4a75c4b59844cb93e970367 < /usr/lib/debug/.build-id/33/2d47f0bc8e4aeac4a75c4b59844cb93e970367.debug --- > /usr/lib/debug/.build-id/0a > /usr/lib/debug/.build-id/0a/bc2524f78e09840bf2f944eec5bc6c7d740233 > /usr/lib/debug/.build-id/0a/bc2524f78e09840bf2f944eec5bc6c7d740233.debug > /usr/lib/debug/.build-id/28 > /usr/lib/debug/.build-id/28/1088f9ef357519fcf8d11d9523bf0f1b8ca252 > /usr/lib/debug/.build-id/28/1088f9ef357519fcf8d11d9523bf0f1b8ca252.debug 14,16c14,16 < /usr/lib/debug/.build-id/ed < /usr/lib/debug/.build-id/ed/f40eda575769f9847d2ec53083289680b80252 < /usr/lib/debug/.build-id/ed/f40eda575769f9847d2ec53083289680b80252.debug --- > /usr/lib/debug/.build-id/be > /usr/lib/debug/.build-id/be/e3efb1fcbe74cf455cdcf04d8ea8641199c77b > /usr/lib/debug/.build-id/be/e3efb1fcbe74cf455cdcf04d8ea8641199c77b.debug ``` The diffs above are all ignorable, since: * The former diff (/etc/zookeeper) is explicitly added by the PR so as to configure the prefix before it. * The latter diffs (/usr/lib/debug/.build-id/*) are just sha-1 checksums. Just in case, I also confirmed that the patched version passed the smoke tests. ``` $ ./gradlew repo ... BUILD SUCCESSFUL in 11s 2 actionable tasks: 2 executed $ cd provisioner/docker $ ./docker-hadoop.sh -d -C config_centos-7.yaml -k bigtop-utils,zookeeper -s zookeeper -c 3 ... TestZookeeper > testZkServerStatus STANDARD_ERROR 22/09/11 23:51:10 INFO lang.Object: Running zkServer.sh status 22/09/11 23:51:11 INFO lang.Object: zkServer.sh status checks out. Finished generating test XML results (0.007 secs) into: /bigtop-home/bigtop-tests/smoke-tests/zookeeper/build/test-results/test Generating HTML test report... Finished generating test html results (0.017 secs) into: /bigtop-home/bigtop-tests/smoke-tests/zookeeper/build/reports/tests/test Now testing... :bigtop-tests:smoke-tests:zookeeper:test (Thread[Daemon worker,5,main]) completed. Took 1.881 secs. BUILD SUCCESSFUL in 1m 2s 30 actionable tasks: 7 executed, 23 up-to-date Stopped 1 worker daemon(s). + rm -rf buildSrc/build/test-results/binary + rm -rf /bigtop-home/.gradle ``` Also, the contents in the packages built with the `-PparentDir=/usr/bigtop` option look reasonable. ``` $ ./gradlew zookeeper-clean zookeeper-pkg -PparentDir=/usr/bigtop $ for i in $(ls output/zookeeper/x86_64); do echo $i; rpm -qlpv output/zookeeper/x86_64/$i; echo; done zookeeper-3.5.9-2.el7.x86_64.rpm drwxr-xr-x 2 root root 0 9月 11 01:35 /etc/zookeeper -rw-r--r-- 1 root root 855 9月 11 01:35 /usr/bigtop/etc/default/zookeeper drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/bigtop/etc/zookeeper/conf.dist ... -rw-r--r-- 1 root root 922 9月 11 01:35 /usr/bigtop/etc/zookeeper/conf.dist/zoo_sample.cfg -rwxr-xr-x 1 root root 413 9月 11 01:35 /usr/bigtop/usr/bin/zookeeper-client ... -rwxr-xr-x 1 root root 750 9月 11 01:35 /usr/bigtop/usr/bin/zookeeper-server-initialize drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/bin ... -rwxr-xr-x 1 root root 10682 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/bin/zkServer.sh lrwxrwxrwx 1 root root 19 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/conf -> /etc/zookeeper/conf drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/contrib ... -rw-r--r-- 1 root root 45854 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/contrib/rest/zookeeper-contrib-rest-3.5.9.jar drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/lib ... -rw-r--r-- 1 root root 248486 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/lib/zookeeper-jute-3.5.9.jar -rw-r--r-- 1 root root 984001 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/zookeeper-3.5.9.jar -rw-r--r-- 1 root root 248486 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/zookeeper-jute-3.5.9.jar lrwxrwxrwx 1 root root 24 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/zookeeper-jute.jar -> zookeeper-jute-3.5.9.jar lrwxrwxrwx 1 root root 19 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper/zookeeper.jar -> zookeeper-3.5.9.jar drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/bigtop/usr/share/doc/zookeeper-3.5.9 ... -rw-r--r-- 1 root root 28959 9月 11 01:34 /usr/bigtop/usr/share/doc/zookeeper-3.5.9/zookeeperTutorial.html -rw-r--r-- 1 root root 1518 9月 11 01:35 /usr/bigtop/usr/share/man/man1/zookeeper.1.gz zookeeper-debuginfo-3.5.9-2.el7.x86_64.rpm drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/lib/debug drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/lib/debug/.build-id ... lrwxrwxrwx 1 root root 56 9月 11 01:35 /usr/lib/debug/.build-id/ff/5a0fabb780796f653dbaa2b04b689d5b4fc2ac.debug -> ../../usr/bigtop/usr/lib/zookeeper-native/load_gen.debug drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/lib/debug/.dwz -rw-r--r-- 1 root root 38977 9月 11 01:35 /usr/lib/debug/.dwz/zookeeper-3.5.9-2.el7.x86_64 drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/lib/debug/usr drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/lib/debug/usr/bigtop drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/lib/debug/usr/bigtop/usr ... lrwxrwxrwx 1 root root 30 9月 11 01:35 /usr/lib/debug/usr/bigtop/usr/lib64/libzookeeper_st.so.debug -> libzookeeper_st.so.2.0.0.debug drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/src/debug/apache-zookeeper-3.5.9 ... drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/src/debug/apache-zookeeper-3.5.9/zookeeper-client/zookeeper-client-c/target/c zookeeper-native-3.5.9-2.el7.x86_64.rpm -rwxr-xr-x 1 root root 175 9月 11 01:35 /usr/bigtop/usr/bin/cli_mt -rwxr-xr-x 1 root root 175 9月 11 01:35 /usr/bigtop/usr/bin/cli_st -rwxr-xr-x 1 root root 177 9月 11 01:35 /usr/bigtop/usr/bin/load_gen drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/bigtop/usr/include/zookeeper ... -rw-r--r-- 1 root root 1054 9月 11 01:35 /usr/bigtop/usr/include/zookeeper/zookeeper_version.h drwxr-xr-x 2 root root 0 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper-native ... -rwxr-xr-x 1 root root 15776 9月 11 01:35 /usr/bigtop/usr/lib/zookeeper-native/load_gen -rw-r--r-- 1 root root 246370 9月 11 01:35 /usr/bigtop/usr/lib64/libzookeeper_mt.a ... -rwxr-xr-x 1 root root 229968 9月 11 01:35 /usr/bigtop/usr/lib64/libzookeeper_st.so.2.0.0 zookeeper-rest-3.5.9-2.el7.x86_64.rpm -rwxr-xr-x 1 root root 4527 9月 11 01:35 /etc/rc.d/init.d/zookeeper-rest zookeeper-server-3.5.9-2.el7.x86_64.rpm -rwxr-xr-x 1 root root 5122 9月 11 01:35 /etc/rc.d/init.d/zookeeper-server ``` -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
