Merge pull request #1570 from satya-bodapati/dev-reducedlock

PXB-3034: Bring back UNIV_DEBUG on debug-sync-thread.
percona · Jun 9, 2024 · d86332a · d86332a
2 parents 0108546 + b8373d5
commit d86332a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/storage/innobase/include/xb0xb.h b/storage/innobase/include/xb0xb.h
@@ -106,10 +106,14 @@ const std::string KEYRING_NOT_LOADED =
 @param[in] name sync point name */
 void debug_sync_point(const char *name);
 
+#ifdef UNIV_DEBUG
 /** Pause xtrabackup thread and wait for resume.
 Thread can be resumed by deleting the sync_point filename
 @param[in] name sync point name */
 void debug_sync_thread(const char *name);
+#else
+#define debug_sync_thread(A)
+#endif /* UNIV_DEBUG */
 
 extern char *xtrabackup_debug_sync;
 

diff --git a/storage/innobase/xtrabackup/src/xtrabackup.cc b/storage/innobase/xtrabackup/src/xtrabackup.cc
@@ -365,7 +365,9 @@ it every INNOBASE_WAKE_INTERVAL'th step. */
 ulong innobase_active_counter = 0;
 
 char *xtrabackup_debug_sync = NULL;
+#ifdef UNIV_DEBUG
 char *xtrabackup_debug_sync_thread = NULL;
+#endif /* UNIV_DEBUG */
 static std::string debug_sync_file_content;
 static const char *dbug_setting = nullptr;
 
@@ -1762,6 +1764,7 @@ void debug_sync_point(const char *name) {
 #endif
 }
 
+#ifdef UNIV_DEBUG
 void debug_sync_thread(const char *name) {
 #ifndef __WIN__
  FILE *fp;
@@ -1803,6 +1806,7 @@ void debug_sync_thread(const char *name) {
 
 #endif
 }
+#endif /* UNIV_DEBUG */
 
 static const char *xb_client_default_groups[] = {"xtrabackup", "client", 0, 0,
  0};