vldb_check: warn about cross-linked mh entries

Warn if an mh extent entry is referenced by more than one server
number in the IpMappedAddr table.

The serveraddr table is used to determine which server numbers have
IP addresses.  If, for some reason, multiple server numbers
reference the same mh entry, currently, the correct serveraddr value
is calculated only for the lowest server number in the set of server
numbers which reference the same mh entry.  Handle this case, and
warn about the duplicated values in the IpMappedAddr table.

Warn about IpMappedAddr entries which reference non-existent mh
blocks.

Change-Id: Ife5bb44747fff922ae6536edbfd95d0fb98c303b
Reviewed-on: http://gerrit.openafs.org/7615
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>

diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c
index 0f3f833..164010c 100644 (file)
--- a/src/vlserver/vldb_check.c
+++ b/src/vlserver/vldb_check.c
@@ -77,6 +77,7 @@ struct er {
 } *record;
 afs_int32 maxentries;
 int serveraddrs[MAXSERVERID + 2];
+u_char serverxref[MAXSERVERID + 2];  /**< to resolve cross-linked mh entries */
 
 /*  Used to control what goes to stdout based on quiet flag */
 void
@@ -884,23 +885,24 @@ CheckIpAddrs(struct vlheader *header)
             */
            mhentries = 0;
            for (j = 1; j < VL_MHSRV_PERBLK; j++) {
+               int first_ipindex = -1;
                e = (struct extentaddr *)&(MHblock[j]);
 
-               /* Search the IpMappedAddr array for the reference to this entry */
+               /* Search the IpMappedAddr array for all the references to this entry. */
+               /* Use the first reference for checking the ip addresses of this entry. */
                for (ipindex = 0; ipindex <= MAXSERVERID; ipindex++) {
-                   if (((header->IpMappedAddr[ipindex] & 0xff000000) ==
-                        0xff000000)
-                       &&
-                       (((header->
-                          IpMappedAddr[ipindex] & 0x00ff0000) >> 16) == i)
-                       && ((header->IpMappedAddr[ipindex] & 0x0000ffff) ==
-                           j)) {
-                       break;
+                   if (((header->IpMappedAddr[ipindex] & 0xff000000) == 0xff000000)
+                       && (((header-> IpMappedAddr[ipindex] & 0x00ff0000) >> 16) == i)
+                       && ((header->IpMappedAddr[ipindex] & 0x0000ffff) == j)) {
+                       if (first_ipindex == -1) {
+                           first_ipindex = ipindex;
+                       } else {
+                           serverxref[ipindex] = first_ipindex;
+                       }
                    }
                }
-               if (ipindex > MAXSERVERID)
-                   ipindex = -1;
-               else
+               ipindex = first_ipindex;
+               if (ipindex != -1)
                    serveraddrs[ipindex] = -1;
 
                if (memcmp(&e->ex_hostuuid, &nulluuid, sizeof(afsUUID)) == 0) {
@@ -970,6 +972,9 @@ CheckIpAddrs(struct vlheader *header)
                   log_error
                        (VLDB_CHECK_ERROR,"IP Addr for entry %d: Multihome block is bad (%d)\n",
                         i, ((header->IpMappedAddr[i] & 0x00ff0000) >> 16));
+               if (caddrs[(header->IpMappedAddr[i] & 0x00ff0000) >> 16] == 0)
+                   log_error(VLDB_CHECK_ERROR,"IP Addr for entry %d: No such multihome block (%d)\n",
+                        i, ((header->IpMappedAddr[i] & 0x00ff0000) >> 16));
                if (((header->IpMappedAddr[i] & 0x0000ffff) > VL_MHSRV_PERBLK)
                    || ((header->IpMappedAddr[i] & 0x0000ffff) < 1))
                    log_error
@@ -981,6 +986,17 @@ CheckIpAddrs(struct vlheader *header)
                         i);
                    serveraddrs[i] = 0;
                }
+               if (serverxref[i] != BADSERVERID) {
+                   log_error
+                       (VLDB_CHECK_WARNING,
+                       "warning: MH block %d, index %d is cross-linked by server numbers %d and %d.\n",
+                       (header->IpMappedAddr[i] & 0x00ff0000) >> 16,
+                       (header->IpMappedAddr[i] & 0x0000ffff),
+                       i, serverxref[i]);
+                   /* set addresses found/not found for this server number,
+                    * using the first index to the mh we found above. */
+                   serveraddrs[i] = serveraddrs[serverxref[i]];
+               }
                if (listservers) {
                    quiet_println("   Server ip addr %d = MH block %d, index %d\n",
                           i, (header->IpMappedAddr[i] & 0x00ff0000) >> 16,
@@ -1121,6 +1137,9 @@ WorkerBee(struct cmd_syndesc *as, void *arock)
     maxentries = (header.vital_header.eofPtr / sizeof(vlentry)) + 1;
     record = calloc(maxentries, sizeof(struct er));
     memset(serveraddrs, 0, sizeof(serveraddrs));
+    for (i = 0; i <= MAXSERVERID; i++) {
+       serverxref[i] = BADSERVERID;
+    }
 
     /* Will fill in the record array of entries it found */
     ReadAllEntries(&header);