ubik: disambiguate "Synchonize database with server" msgs

Ubik issues the same message in two very different cases:
- sync server issues DISK_GetFile to obtain the latest version
- non-sync server receives DISK_SendFile from the sync server

Modify the messages so they provide more information and are
distinguishable from each other.

Reviewed-on: https://gerrit.openafs.org/12615
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit b9fe4d4290ad19faf3b5fb5dc0c3b1ee3ee5ab69)

Change-Id: I806c2ce5ada097b07022d8c4da81f613a3f9989c
Reviewed-on: https://gerrit.openafs.org/13186
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Joe Gorse <jhgorse@gmail.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Marcio Brito Barbosa <mbarbosa@sinenomine.net>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c
index 199d15fc7e0b57c373f668cdd523848808dfc2c4..fd726a558d5059f4a8f4e4d11ba6fad89b4dc996 100644 (file)
--- a/src/ubik/recovery.c
+++ b/src/ubik/recovery.c
@@ -599,7 +599,7 @@ urecovery_Interact(void *dummy)
            UBIK_ADDR_LOCK;
            rxcall = rx_NewCall(bestServer->disk_rxcid);
 
-           ViceLog(0, ("Ubik: Synchronize database with server %s\n",
+           ViceLog(0, ("Ubik: Synchronize database via DISK_GetFile to server %s\n",
                       afs_inet_ntoa_r(bestServer->addr[0], hoststr)));
            UBIK_ADDR_UNLOCK;
 

diff --git a/src/ubik/remote.c b/src/ubik/remote.c
index 6b78d530bb66ce6045bdcb1968339760f7b09ef1..a4fbf8410dc722b1fbadc17cb03c2f6015b0040d 100644 (file)
--- a/src/ubik/remote.c
+++ b/src/ubik/remote.c
@@ -495,7 +495,7 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file,
     /* abort any active trans that may scribble over the database */
     urecovery_AbortAll(dbase);
 
-    ViceLog(0, ("Ubik: Synchronize database with server %s\n",
+    ViceLog(0, ("Ubik: Synchronize database via DISK_SendFile from server %s\n",
               afs_inet_ntoa_r(otherHost, hoststr)));
 
     offset = 0;