jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-02-01 05:57:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vlserver: fix logging of ip addresses

Browse Source 
Remove the spurious dates surrounding IP addresess in the VLLog.
Instead of multiple calls to the logging function for a given log
line, format a string containing the addresses and call the log
function once.

Changes the log output from,

  ...  The following fileserver is being registered in the VLDB:
  ...         [Tue Jul  4 14:11:43 2012 192.168.10.128Tue Jul  4 14:11:43 2012 ]
  ...  It will create a new entry in the VLDB.

to,

  ...  The following fileserver is being registered in the VLDB:
  ...         [192.168.10.128]
  ...  It will create a new entry in the VLDB.

Reviewed-on: http://gerrit.openafs.org/7750
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 65a5e3ce92c47a87c3dca54cec456ae0337c78ef)

Change-Id: I106556cda1046e6e8c971787ed8d056da70b77b9
Reviewed-on: http://gerrit.openafs.org/8207
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
This commit is contained in:
Michael Meffie 2012-07-04 17:54:02 -04:00 committed by Derrick Brashear
parent 4071a3ec0e
commit 0720095b09
1 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/vlserver/vlprocs.c
View File

@ -2011,7 +2011,16 @@ SVL_GetAddrs(struct rx_call *rxcall,
return (ubik_EndTrans(trans)); return (ubik_EndTrans(trans));
} }
#define PADDR(addr) VLog(0,("%d.%d.%d.%d", (addr>>24)&0xff, (addr>>16)&0xff, (addr>>8) &0xff, addr&0xff)); static_inline void
append_addr(char *buffer, afs_uint32 addr, size_t buffer_size)
{
int n = strlen(buffer);
if (buffer_size > n) {
snprintf(buffer + n, buffer_size - n, "%u.%u.%u.%u",
(addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff,
addr & 0xff);
}
}
afs_int32 afs_int32
SVL_RegisterAddrs(struct rx_call *rxcall, afsUUID *uuidp, afs_int32 spare1, SVL_RegisterAddrs(struct rx_call *rxcall, afsUUID *uuidp, afs_int32 spare1,
@ -2021,6 +2030,7 @@ SVL_RegisterAddrs(struct rx_call *rxcall, afsUUID *uuidp, afs_int32 spare1,
struct ubik_trans *trans; struct ubik_trans *trans;
int cnt, h, i, j, k, m, base, index; int cnt, h, i, j, k, m, base, index;
struct extentaddr *exp = 0, *tex; struct extentaddr *exp = 0, *tex;
char addrbuf[256];
afsUUID tuuid; afsUUID tuuid;
afs_uint32 addrs[VL_MAXIPADDRS_PERMH]; afs_uint32 addrs[VL_MAXIPADDRS_PERMH];
afs_int32 fbase; afs_int32 fbase;
@ -2144,29 +2154,27 @@ SVL_RegisterAddrs(struct rx_call *rxcall, afsUUID *uuidp, afs_int32 spare1,
|| (!foundUuidEntry && (count > 1))) { || (!foundUuidEntry && (count > 1))) {
VLog(0, VLog(0,
("The following fileserver is being registered in the VLDB:\n")); ("The following fileserver is being registered in the VLDB:\n"));
VLog(0, (" [")); for (addrbuf[0] = '\0', k = 0; k < cnt; k++) {
for (k = 0; k < cnt; k++) {
if (k > 0) if (k > 0)
VLog(0,(" ")); strlcat(addrbuf, " ", sizeof(addrbuf));
PADDR(addrs[k]); append_addr(addrbuf, addrs[k], sizeof(addrbuf));
} }
VLog(0,("]\n")); VLog(0, (" [%s]\n", addrbuf));
if (foundUuidEntry) { if (foundUuidEntry) {
VLog(0, VLog(0,
(" It would have replaced the existing VLDB server entry:\n")); (" It would have replaced the existing VLDB server entry:\n"));
VLog(0, (" entry %d: [", FoundUuid));
base = (HostAddress[FoundUuid] >> 16) & 0xff; base = (HostAddress[FoundUuid] >> 16) & 0xff;
index = HostAddress[FoundUuid] & 0x0000ffff; index = HostAddress[FoundUuid] & 0x0000ffff;
exp = &ex_addr[base][index]; exp = &ex_addr[base][index];
for (mhidx = 0; mhidx < VL_MAXIPADDRS_PERMH; mhidx++) { for (addrbuf[0] = '\0', mhidx = 0; mhidx < VL_MAXIPADDRS_PERMH; mhidx++) {
if (!exp->ex_addrs[mhidx]) if (!exp->ex_addrs[mhidx])
continue; continue;
if (mhidx > 0) if (mhidx > 0)
VLog(0,(" ")); strlcat(addrbuf, " ", sizeof(addrbuf));
PADDR(ntohl(exp->ex_addrs[mhidx])); append_addr(addrbuf, ntohl(exp->ex_addrs[mhidx]), sizeof(addrbuf));
} }
VLog(0, ("]\n")); VLog(0, (" entry %d: [%s]\n", FoundUuid, addrbuf));
} }
if (count == 1) if (count == 1)
@ -2175,9 +2183,9 @@ SVL_RegisterAddrs(struct rx_call *rxcall, afsUUID *uuidp, afs_int32 spare1,
VLog(0, (" Yet other VLDB server entries exist:\n")); VLog(0, (" Yet other VLDB server entries exist:\n"));
for (j = 0; j < count; j++) { for (j = 0; j < count; j++) {
srvidx = WillChange[j]; srvidx = WillChange[j];
VLog(0, (" entry %d: ", srvidx)); addrbuf[0] = '\0';
if ((HostAddress[srvidx] & 0xff000000) == 0xff000000) { if ((HostAddress[srvidx] & 0xff000000) == 0xff000000) {
VLog(0, ("[")); strlcat(addrbuf, "[", sizeof(addrbuf));
base = (HostAddress[srvidx] >> 16) & 0xff; base = (HostAddress[srvidx] >> 16) & 0xff;
index = HostAddress[srvidx] & 0x0000ffff; index = HostAddress[srvidx] & 0x0000ffff;
exp = &ex_addr[base][index]; exp = &ex_addr[base][index];
@ -2185,14 +2193,14 @@ SVL_RegisterAddrs(struct rx_call *rxcall, afsUUID *uuidp, afs_int32 spare1,
if (!exp->ex_addrs[mhidx]) if (!exp->ex_addrs[mhidx])
continue; continue;
if (mhidx > 0) if (mhidx > 0)
VLog(0, (" ")); strlcat(addrbuf, " ", sizeof(addrbuf));
PADDR(ntohl(exp->ex_addrs[mhidx])); append_addr(addrbuf, ntohl(exp->ex_addrs[mhidx]), sizeof(addrbuf));
} }
VLog(0, ("]")); strlcat(addrbuf, "]", sizeof(addrbuf));
} else { } else {
PADDR(HostAddress[srvidx]); append_addr(addrbuf, HostAddress[srvidx], sizeof(addrbuf));
} }
VLog(0, ("\n")); VLog(0, (" entry %d: %s\n", srvidx, addrbuf));
} }
if (count == 1) if (count == 1)
@ -2235,26 +2243,24 @@ SVL_RegisterAddrs(struct rx_call *rxcall, afsUUID *uuidp, afs_int32 spare1,
} }
VLog(0, ("The following fileserver is being registered in the VLDB:\n")); VLog(0, ("The following fileserver is being registered in the VLDB:\n"));
VLog(0, (" [")); for (addrbuf[0] = '\0', k = 0; k < cnt; k++) {
for (k = 0; k < cnt; k++) {
if (k > 0) if (k > 0)
VLog(0, (" ")); strlcat(addrbuf, " ", sizeof(addrbuf));
PADDR(addrs[k]); append_addr(addrbuf, addrs[k], sizeof(addrbuf));
} }
VLog(0, ("]\n")); VLog(0, (" [%s]\n", addrbuf));
if (foundUuidEntry) { if (foundUuidEntry) {
VLog(0, VLog(0,
(" It will replace the following existing entry in the VLDB (same uuid):\n")); (" It will replace the following existing entry in the VLDB (same uuid):\n"));
VLog(0, (" entry %d: [", FoundUuid)); for (addrbuf[0] = '\0', k = 0; k < VL_MAXIPADDRS_PERMH; k++) {
for (k = 0; k < VL_MAXIPADDRS_PERMH; k++) {
if (exp->ex_addrs[k] == 0) if (exp->ex_addrs[k] == 0)
continue; continue;
if (k > 0) if (k > 0)
VLog(0, (" ")); strlcat(addrbuf, " ", sizeof(addrbuf));
PADDR(ntohl(exp->ex_addrs[k])); append_addr(addrbuf, ntohl(exp->ex_addrs[k]), sizeof(addrbuf));
} }
VLog(0, ("]\n")); VLog(0, (" entry %d: [%s]\n", FoundUuid, addrbuf));
} else if (willReplaceCnt || (count == 1)) { } else if (willReplaceCnt || (count == 1)) {
/* If we are not replacing an entry and there is only one entry to change, /* If we are not replacing an entry and there is only one entry to change,
* then we will replace that entry. * then we will replace that entry.
@ -2272,22 +2278,21 @@ SVL_RegisterAddrs(struct rx_call *rxcall, afsUUID *uuidp, afs_int32 spare1,
VLog(0, VLog(0,
(" It will replace the following existing entry in the VLDB (new uuid):\n")); (" It will replace the following existing entry in the VLDB (new uuid):\n"));
VLog(0, (" entry %d: [", ReplaceEntry)); for (addrbuf[0] = '\0', k = 0; k < VL_MAXIPADDRS_PERMH; k++) {
for (k = 0; k < VL_MAXIPADDRS_PERMH; k++) {
if (exp->ex_addrs[k] == 0) if (exp->ex_addrs[k] == 0)
continue; continue;
if (k > 0) if (k > 0)
VLog(0, (" ")); strlcat(addrbuf, " ", sizeof(addrbuf));
PADDR(ntohl(exp->ex_addrs[k])); append_addr(addrbuf, ntohl(exp->ex_addrs[k]), sizeof(addrbuf));
} }
VLog(0, ("]\n")); VLog(0, (" entry %d: [%s]", ReplaceEntry, addrbuf));
} else { } else {
/* Not a mh entry. So we have to create a new mh entry and /* Not a mh entry. So we have to create a new mh entry and
* put it on the ReplaceEntry slot of the HostAddress array. * put it on the ReplaceEntry slot of the HostAddress array.
*/ */
VLog(0, (" It will replace existing entry %d, ", ReplaceEntry)); addrbuf[0] = '\0';
PADDR(HostAddress[ReplaceEntry]); append_addr(addrbuf, HostAddress[ReplaceEntry], sizeof(addrbuf));
VLog(0,(", in the VLDB (new uuid):\n")); VLog(0, (" It will replace existing entry %d, [%s], in the VLDB (new uuid):\n", ReplaceEntry, addrbuf));
code = code =
FindExtentBlock(trans, uuidp, 1, ReplaceEntry, &exp, &fbase); FindExtentBlock(trans, uuidp, 1, ReplaceEntry, &exp, &fbase);
@ -2351,12 +2356,11 @@ SVL_RegisterAddrs(struct rx_call *rxcall, afsUUID *uuidp, afs_int32 spare1,
VLog(0, VLog(0,
(" The following existing entries in the VLDB will be updated:\n")); (" The following existing entries in the VLDB will be updated:\n"));
VLog(0, (" entry %d: [", WillChange[i])); for (addrbuf[0] = '\0', h = j = 0; j < VL_MAXIPADDRS_PERMH; j++) {
for (h = j = 0; j < VL_MAXIPADDRS_PERMH; j++) {
if (tex->ex_addrs[j]) { if (tex->ex_addrs[j]) {
if (j > 0) if (j > 0)
printf(" "); strlcat(addrbuf, " ", sizeof(addrbuf));
PADDR(ntohl(tex->ex_addrs[j])); append_addr(addrbuf, ntohl(tex->ex_addrs[j]), sizeof(addrbuf));
} }
for (k = 0; k < cnt; k++) { for (k = 0; k < cnt; k++) {
@ -2372,7 +2376,7 @@ SVL_RegisterAddrs(struct rx_call *rxcall, afsUUID *uuidp, afs_int32 spare1,
for (j = h; j < VL_MAXIPADDRS_PERMH; j++) { for (j = h; j < VL_MAXIPADDRS_PERMH; j++) {
tex->ex_addrs[j] = 0; /* zero rest of mh entry */ tex->ex_addrs[j] = 0; /* zero rest of mh entry */
} }
VLog(0, ("]\n")); VLog(0, (" entry %d: [%s]\n", WillChange[i], addrbuf));
/* Write out the modified mh entry */ /* Write out the modified mh entry */
tex->ex_uniquifier = htonl(ntohl(tex->ex_uniquifier) + 1); tex->ex_uniquifier = htonl(ntohl(tex->ex_uniquifier) + 1);
@ -3213,6 +3217,8 @@ ChangeIPAddr(afs_uint32 ipaddr1, afs_uint32 ipaddr2, struct ubik_trans *atrans)
int pollcount = 0; int pollcount = 0;
struct nvlentry tentry; struct nvlentry tentry;
int ipaddr1_id = -1, ipaddr2_id = -1; int ipaddr1_id = -1, ipaddr2_id = -1;
char addrbuf1[256];
char addrbuf2[256];
if (!atrans) if (!atrans)
return VL_CREATEFAIL; return VL_CREATEFAIL;
@ -3312,25 +3318,22 @@ ChangeIPAddr(afs_uint32 ipaddr1, afs_uint32 ipaddr2, struct ubik_trans *atrans)
VLog(0, VLog(0,
("The following IP address is being %s:\n", ("The following IP address is being %s:\n",
(ipaddr2 ? "changed" : "removed"))); (ipaddr2 ? "changed" : "removed")));
VLog(0, (" entry %d: ", i)); addrbuf1[0] = addrbuf2[0] = '\0';
if (exp) { if (exp) {
VLog(0, ("["));
for (mhidx = 0; mhidx < VL_MAXIPADDRS_PERMH; mhidx++) { for (mhidx = 0; mhidx < VL_MAXIPADDRS_PERMH; mhidx++) {
if (!exp->ex_addrs[mhidx]) if (!exp->ex_addrs[mhidx])
continue; continue;
if (mhidx > 0) if (mhidx > 0)
VLog(0, (" ")); strlcat(addrbuf1, " ", sizeof(addrbuf1));
PADDR(ntohl(exp->ex_addrs[mhidx])); append_addr(addrbuf1, ntohl(exp->ex_addrs[mhidx]), sizeof(addrbuf1));
} }
VLog(0, ("]"));
} else { } else {
PADDR(ipaddr1); append_addr(addrbuf1, ipaddr1, sizeof(addrbuf1));
} }
if (ipaddr2) { if (ipaddr2) {
VLog(0, (" -> ")); append_addr(addrbuf2, ipaddr2, sizeof(addrbuf2));
PADDR(ipaddr2);
} }
VLog(0, ("\n")); VLog(0, (" entry %d: [%s] -> [%s]\n", i, addrbuf1, addrbuf2));
/* Change the registered uuuid addresses */ /* Change the registered uuuid addresses */
if (exp) { if (exp) {