FB8-67: Publish git hash in db log and via global status #991

dutow · 2019-03-19T07:40:53Z

Jira ticket: https://jira.percona.com/browse/FB8-67

Reference commit: e4f22e0
Reference commit: f00855b
Reference commit: 92bec02

Rocksdb hash and date is set to "none" until rocksdb is added.

percona-ysorokin · 2019-03-19T09:34:06Z

sql/mysqld.cc

@@ -6739,6 +6746,12 @@ int mysqld_main(int argc, char **argv)

  create_compress_gtid_table_thread();

+  // NO_LINT_DEBUG
+  sql_print_information("MySQL git hash: %s (%s)", git_hash, git_date);


Suggested change

sql_print_information("MySQL git hash: %s (%s)", git_hash, git_date);

sql_print_information(ER_DEFAULT(ER_GIT_HASH), "MySQL", git_hash, git_date);

percona-ysorokin · 2019-03-19T09:35:02Z

share/errmsg-utf8.txt

@@ -18527,8 +18527,8 @@ ER_PLACEHOLDER_50021
 ER_PLACEHOLDER_50022
  eng "Placeholder"

-ER_PLACEHOLDER_50023
-  eng "Placeholder"
+ER_GIT_HASH


Why this particular one? 50023?

The same id (1523) was used in the 5.6 commit.

percona-ysorokin · 2019-03-19T09:41:42Z

sql/CMakeLists.txt

+  SET(GITHASH_DEPENDS ${GITHASH_DEPENDS} ${CMAKE_SOURCE_DIR}/.git/logs/HEAD)
+ENDIF()
+
+SET(GITHASH_PERL ${CMAKE_SOURCE_DIR}/cmake/githash.pl)


This commit does not have cmake/githash.pl

Updated with missing files.

percona-ysorokin · 2019-03-19T09:46:25Z

sql/CMakeLists.txt

+
+# If the repository was modified (via push or pull) or if the
+# mysql_githash.h.in changed rebuild the mysql_githash.h file
+SET(GITHASH_HEADER_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/mysql_githash.h.in)


This commit does not have mysql_githash.h.in

percona-ysorokin

LGTM with "#pragma once" issue addressed

percona-ysorokin · 2019-03-19T13:13:32Z

sql/mysql_githash.h.in

+   Do not hand edit this file.  It is generated as part of the build
+   process and contains git hashes and dates for MySQL and RocksDB
+*/
+#pragma once


Non-portable #pragma once
Please, change to standard header guards

#ifndef MYSQL_GITHASH_H #define MYSQL_GITHASH_H ... #endif

facebook-github-bot

@hermanlee has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

hermanlee · 2019-04-02T22:48:35Z

sql/mysqld.cc

@@ -8639,6 +8671,8 @@ SHOW_VAR status_vars[] = {
     SHOW_SCOPE_GLOBAL},
    {"Flush_commands", (char *)&refresh_version, SHOW_LONG_NOFLUSH,
     SHOW_SCOPE_GLOBAL},
+    {"Git_hash", (char *)git_hash, SHOW_CHAR},
+    {"Git_date", (char *)git_date, SHOW_CHAR},


Are we missing the Rocksdb_git_hash and Rocksdb_git_date entries in SHOW_VAR? It would be fine to add them here even though they only show empty strings for now.

This looks to be missing the SHOW_SCOPE_GLOBAL parameters.

I can fix this. This looks to be the only issue.

hermanlee · 2019-04-03T00:24:07Z

sql/CMakeLists.txt

+ADD_CUSTOM_COMMAND(OUTPUT ${GITHASH_HEADER}
+  COMMAND ${CMAKE_COMMAND} -E copy ${GITHASH_HEADER_SOURCE} ${GITHASH_HEADER}
+  COMMAND ${CMAKE_COMMAND} -E echo ${GITHASH_PERL} ${GITHASH_PERL_OPTS}
+  COMMAND perl ${GITHASH_PERL} ${GITHASH_PERL_OPTS}


This command fails with:

You must specify none or all of the git hashes and dates Usage: githash.pl [options]

I think you need to change the script to handle only adding the two rocksdb arguments.

hermanlee · 2019-04-03T00:24:56Z

sql/CMakeLists.txt

+SET(GITHASH_DEPENDS ${GITHASH_HEADER_SOURCE})
+SET(GITHASH_PERL_OPTS --git_root=${CMAKE_SOURCE_DIR} --file=${GITHASH_HEADER})
+SET(GITHASH_PERL_OPTS ${GITHASH_PERL_OPTS}
+                      --rocksdb_githash=none}


Extra '}' at the end.

hermanlee · 2019-04-03T00:39:03Z

cmake/githash.pl

+  if ($mysql_git_hash eq "") {
+    # retrieve the git hash and date for the main repository
+    ($mysql_git_hash, $mysql_git_date) = git_hash_and_date $root;
+    # retrieve the git hash and date for the rocksdb submodule


Should also have this check to see if the rocksdb hash have been set. If not, then perform the git_hash_and_date, which requires "cd rocksdb".

Jira ticket: https://jira.percona.com/browse/FB8-67 Reference commit: e4f22e0 Reference commit: f00855b Reference commit: 92bec02 Rocksdb hash and date is set to "none" until rocksdb is added.

facebook-github-bot · 2019-05-01T09:44:22Z

@dutow has updated the pull request. Re-import the pull request

facebook-github-bot

@hermanlee has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

Summary: Jira ticket: https://jira.percona.com/browse/FB8-67 Reference commit: e4f22e0 Reference commit: f00855b Reference commit: 92bec02 Rocksdb hash and date is set to "none" until rocksdb is added. Pull Request resolved: #991 Reviewed By: lth Differential Revision: D14603932 Pulled By: lth fbshipit-source-id: debd339

Summary: Jira ticket: https://jira.percona.com/browse/FB8-67 Reference commit: e4f22e0 Reference commit: f00855b Reference commit: 92bec02 Rocksdb hash and date is set to "none" until rocksdb is added. Pull Request resolved: #991 Reviewed By: lth Differential Revision: D14603932 Pulled By: lth fbshipit-source-id: 35c7328

Summary: Jira ticket: https://jira.percona.com/browse/FB8-67 Reference commit: facebook@e4f22e0 Reference commit: facebook@f00855b Reference commit: facebook@92bec02 Reference commit: facebook@408ea32ed2 Rocksdb hash and date is set to "none" until rocksdb is added. Pull Request resolved: facebook#991 Reviewed By: lth Differential Revision: D14603932 Pulled By: lth

percona#991) Summary: Jira ticket: https://jira.percona.com/browse/FB8-67 Reference commit: facebook/mysql-5.6@e4f22e0 Reference commit: facebook/mysql-5.6@f00855b Reference commit: facebook/mysql-5.6@92bec02 Reference commit: facebook/mysql-5.6@408ea32ed2 Rocksdb hash and date is set to "none" until rocksdb is added. Pull Request resolved: facebook/mysql-5.6#991 Reviewed By: lloyd Differential Revision: D14603932 Pulled By: lth

… (facebook#991) Summary: Jira ticket: https://jira.percona.com/browse/FB8-67 Reference commit: facebook@e4f22e0 Reference commit: facebook@f00855b Reference commit: facebook@92bec02 Reference commit: facebook@408ea32ed2 Rocksdb hash and date is set to "none" until rocksdb is added. Pull Request resolved: facebook#991 Reviewed By: lloyd Differential Revision: D14603932 Pulled By: lth

facebook-github-bot added the CLA Signed label Mar 19, 2019

percona-ysorokin suggested changes Mar 19, 2019

View reviewed changes

percona-ysorokin approved these changes Mar 19, 2019

View reviewed changes

hermanlee force-pushed the fb-mysql-8.0.13 branch from e9926c3 to c3bd1c6 Compare March 21, 2019 21:53

dutow changed the title ~~WIP FB8-67: Publish git hash in db log and via global status~~ FB8-67: Publish git hash in db log and via global status Mar 25, 2019

facebook-github-bot reviewed Mar 25, 2019

View reviewed changes

hermanlee requested changes Apr 2, 2019

View reviewed changes

hermanlee requested changes Apr 3, 2019

View reviewed changes

hermanlee reviewed Apr 3, 2019

View reviewed changes

FB8-67: Publish git hash in db log and via global status

91bf811

Jira ticket: https://jira.percona.com/browse/FB8-67 Reference commit: e4f22e0 Reference commit: f00855b Reference commit: 92bec02 Rocksdb hash and date is set to "none" until rocksdb is added.

facebook-github-bot reviewed May 8, 2019

View reviewed changes

hermanlee closed this May 9, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FB8-67: Publish git hash in db log and via global status #991

FB8-67: Publish git hash in db log and via global status #991

dutow commented Mar 19, 2019

percona-ysorokin Mar 19, 2019

dutow Mar 19, 2019

percona-ysorokin Mar 19, 2019

dutow Mar 19, 2019

percona-ysorokin Mar 19, 2019

dutow Mar 19, 2019

percona-ysorokin Mar 19, 2019

percona-ysorokin left a comment

percona-ysorokin Mar 19, 2019

facebook-github-bot left a comment

hermanlee Apr 2, 2019

hermanlee May 8, 2019

hermanlee May 8, 2019

hermanlee Apr 3, 2019

hermanlee Apr 3, 2019

hermanlee Apr 3, 2019

facebook-github-bot commented May 1, 2019

facebook-github-bot left a comment

	sql_print_information("MySQL git hash: %s (%s)", git_hash, git_date);
	sql_print_information(ER_DEFAULT(ER_GIT_HASH), "MySQL", git_hash, git_date);

FB8-67: Publish git hash in db log and via global status #991

FB8-67: Publish git hash in db log and via global status #991

Conversation

dutow commented Mar 19, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

percona-ysorokin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

facebook-github-bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

facebook-github-bot commented May 1, 2019

facebook-github-bot left a comment

Choose a reason for hiding this comment