From cba696a8d7473d79e6d094d329adbb09008a3484 Mon Sep 17 00:00:00 2001 From: Artem Ervits Date: Tue, 28 May 2019 09:54:46 -0400 Subject: [PATCH] HBASE-22469 replace md5 checksum in saveVersion script with sha512 --- hbase-common/src/saveVersion.sh | 8 ++++---- .../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 4 ++-- .../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git hbase-common/src/saveVersion.sh hbase-common/src/saveVersion.sh index 507bbb0200..181d009abf 100644 --- hbase-common/src/saveVersion.sh +++ hbase-common/src/saveVersion.sh @@ -49,14 +49,14 @@ if [ -z "${revision}" ]; then revision="Unknown" url="file://$cwd" fi -if ! [ -x "$(command -v md5sum)" ]; then - if ! [ -x "$(command -v md5)" ]; then +if ! [ -x "$(command -v openssl)" ]; then + if ! [ -x "$(command -v gpg)" ]; then srcChecksum="Unknown" else - srcChecksum=`find hbase-*/src/main/ | grep -e "\.java" -e "\.proto" | LC_ALL=C sort | xargs md5 | md5 | cut -d ' ' -f 1` + srcChecksum=`find hbase-*/src/main/ | grep -e "\.java" -e "\.proto" | LC_ALL=C sort | xargs gpg --print-md sha512 | gpg --print-md sha512 | cut -d ' ' -f 1` fi else - srcChecksum=`find hbase-*/src/main/ | grep -e "\.java" -e "\.proto" | LC_ALL=C sort | xargs md5sum | md5sum | cut -d ' ' -f 1` + srcChecksum=`find hbase-*/src/main/ | grep -e "\.java" -e "\.proto" | LC_ALL=C sort | xargs openssl dgst -sha512 | openssl dgst -sha512 | cut -d ' ' -f 1` fi popd diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 06fe2c9499..fb4aafca43 100644 --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -302,7 +302,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); HBase Source Checksum <% org.apache.hadoop.hbase.util.VersionInfo.getSrcChecksum() %> - HBase source MD5 checksum + HBase source SHA512 checksum Hadoop Version @@ -317,7 +317,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); Hadoop Source Checksum <% org.apache.hadoop.util.VersionInfo.getSrcChecksum() %> - Hadoop source MD5 checksum + Hadoop source SHA512 checksum ZooKeeper Client Version diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index 94fcecf308..9d388f1e81 100644 --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -177,7 +177,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; HBase Source Checksum <% org.apache.hadoop.hbase.util.VersionInfo.getSrcChecksum() %> - HBase source MD5 checksum + HBase source SHA512 checksum Hadoop Version @@ -192,7 +192,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; Hadoop Source Checksum <% org.apache.hadoop.util.VersionInfo.getSrcChecksum() %> - Hadoop source MD5 checksum + Hadoop source SHA512 checksum ZooKeeper Client Version -- 2.16.2