You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by el...@apache.org on 2019/05/28 19:28:00 UTC
[hbase] branch branch-2 updated: HBASE-22469 replace md5 checksum
in saveVersion script with sha512
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new e9e680f HBASE-22469 replace md5 checksum in saveVersion script with sha512
e9e680f is described below
commit e9e680f3d16a79aafab38c713ebb39d1d4bc9664
Author: Artem Ervits <ge...@gmail.com>
AuthorDate: Tue May 28 14:52:40 2019 -0400
HBASE-22469 replace md5 checksum in saveVersion script with sha512
Signed-off-by: Josh Elser <el...@apache.org>
---
hbase-common/src/saveVersion.sh | 8 ++++----
.../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 2 +-
.../org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hbase-common/src/saveVersion.sh b/hbase-common/src/saveVersion.sh
index 507bbb0..181d009 100644
--- a/hbase-common/src/saveVersion.sh
+++ b/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 a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
index 81f131e..b5edd52 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -302,7 +302,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<tr>
<td>HBase Source Checksum</td>
<td><% org.apache.hadoop.hbase.util.VersionInfo.getSrcChecksum() %></td>
- <td>HBase source MD5 checksum</td>
+ <td>HBase source SHA512 checksum</td>
</tr>
<tr>
<td>Hadoop Version</td>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
index 94fcecf..2496b5d 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
@@ -177,7 +177,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
<tr>
<td>HBase Source Checksum</td>
<td><% org.apache.hadoop.hbase.util.VersionInfo.getSrcChecksum() %></td>
- <td>HBase source MD5 checksum</td>
+ <td>HBase source SHA512 checksum</td>
</tr>
<tr>
<td>Hadoop Version</td>