From b9603bfb27c3c1d5ae90ed68545a4dd9fe9da862 Mon Sep 17 00:00:00 2001 From: Mark Vitale Date: Mon, 8 May 2017 17:50:00 -0400 Subject: [PATCH] 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 Reviewed-by: Andrew Deason Reviewed-by: Benjamin Kaduk (cherry picked from commit b9fe4d4290ad19faf3b5fb5dc0c3b1ee3ee5ab69) Change-Id: I806c2ce5ada097b07022d8c4da81f613a3f9989c Reviewed-on: https://gerrit.openafs.org/13186 Reviewed-by: Mark Vitale Reviewed-by: Michael Meffie Reviewed-by: Joe Gorse Reviewed-by: Andrew Deason Reviewed-by: Marcio Brito Barbosa Reviewed-by: Cheyenne Wills Tested-by: BuildBot Reviewed-by: Stephan Wiesand --- src/ubik/recovery.c | 2 +- src/ubik/remote.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c index 199d15fc7..fd726a558 100644 --- 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 6b78d530b..a4fbf8410 100644 --- 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; -- 2.39.5