Merge remote-tracking branch 'origin/slurm-2.6'

src/slurmdbd/backup.c

@@ -82,9 +82,9 @@ static void _reopen_slurmdbd_fd(slurm_addr_t dbd_addr)
 	_open_slurmdbd_fd(dbd_addr);
 }
 
-/* run_backup - this is the backup controller, it should run in standby
+/* run_dbd_backup - this is the backup controller, it should run in standby
  *	mode, assuming control when the primary controller stops responding */
-extern void run_backup(void)
+extern void run_dbd_backup(void)
 {
 	slurm_addr_t dbd_addr;
 

src/slurmdbd/backup.h

@@ -47,9 +47,9 @@ extern bool primary_resumed;
 extern bool backup;
 extern bool have_control;
 
-/* run_backup - this is the backup dbd, it should run in standby
+/* run_dbd_backup - this is the backup dbd, it should run in standby
  *	mode, assuming control when the primary dbd stops responding */
-extern void run_backup(void);
+extern void run_dbd_backup(void);
 
 
 #endif

src/slurmdbd/slurmdbd.c

@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
 			info("slurmdbd running in background mode");
 			have_control = false;
 			backup = true;
-			run_backup();
+			run_dbd_backup();
 			if (!shutdown_time)
 				assoc_mgr_refresh_lists(db_conn, NULL);
 		} else if (slurmdbd_conf->dbd_host &&
@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
 			info("slurmdbd version %s started",
 			     SLURM_VERSION_STRING);
 			if (backup)
-				run_backup();
+				run_dbd_backup();
 		}
 
 		_request_registrations(db_conn);