LU-14661 obdclass: Add peer/peer NI when processing llog

[fs/lustre-release.git] / lustre / obdclass / lustre_peer.c

diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c
index d8dc95a..16b50f9 100644 (file)
--- a/lustre/obdclass/lustre_peer.c
+++ b/lustre/obdclass/lustre_peer.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #define DEBUG_SUBSYSTEM S_RPC
@@ -40,13 +39,11 @@
 #include <lustre_net.h>
 #include <lprocfs_status.h>
 
-#define NIDS_MAX        32
-
 struct uuid_nid_data {
        struct list_head        un_list;
        struct obd_uuid         un_uuid;
        int                     un_nid_count;
-       lnet_nid_t              un_nids[NIDS_MAX];
+       lnet_nid_t              un_nids[MTI_NIDS_MAX];
 };
 
 /* FIXME: This should probably become more elegant than a global linked list */
@@ -82,6 +79,7 @@ int class_add_uuid(const char *uuid, __u64 nid)
 {
        struct uuid_nid_data *data, *entry;
        int found = 0;
+       int rc;
 
        LASSERT(nid != 0);  /* valid newconfig NID is never zero */
 
@@ -107,7 +105,7 @@ int class_add_uuid(const char *uuid, __u64 nid)
                                        break;
 
                        if (i == entry->un_nid_count) {
-                               LASSERT(entry->un_nid_count < NIDS_MAX);
+                               LASSERT(entry->un_nid_count < MTI_NIDS_MAX);
                                entry->un_nids[entry->un_nid_count++] = nid;
                        }
                        break;
@@ -120,12 +118,20 @@ int class_add_uuid(const char *uuid, __u64 nid)
        if (found) {
                CDEBUG(D_INFO, "found uuid %s %s cnt=%d\n", uuid,
                       libcfs_nid2str(nid), entry->un_nid_count);
+               rc = LNetAddPeer(entry->un_nids, entry->un_nid_count);
+               CDEBUG(D_INFO, "Add peer %s rc = %d\n",
+                      libcfs_nid2str(data->un_nids[0]), rc);
                OBD_FREE(data, sizeof(*data));
        } else {
                CDEBUG(D_INFO, "add uuid %s %s\n", uuid, libcfs_nid2str(nid));
+               rc = LNetAddPeer(data->un_nids, data->un_nid_count);
+               CDEBUG(D_INFO, "Add peer %s rc = %d\n",
+                      libcfs_nid2str(data->un_nids[0]), rc);
        }
+
        return 0;
 }
+EXPORT_SYMBOL(class_add_uuid);
 
 /* Delete the nids for one uuid if specified, otherwise delete all */
 int class_del_uuid(const char *uuid)
@@ -153,9 +159,8 @@ int class_del_uuid(const char *uuid)
                return -EINVAL;
        }
 
-       while (!list_empty(&deathrow)) {
-               data = list_entry(deathrow.next, struct uuid_nid_data,
-                                 un_list);
+       while ((data = list_first_entry_or_null(&deathrow, struct uuid_nid_data,
+                                               un_list)) != NULL) {
                list_del(&data->un_list);
 
                CDEBUG(D_INFO, "del uuid %s %s/%d\n",
@@ -168,6 +173,47 @@ int class_del_uuid(const char *uuid)
        return 0;
 }
 
+int class_add_nids_to_uuid(struct obd_uuid *uuid, lnet_nid_t *nids,
+                          int nid_count)
+{
+       struct uuid_nid_data *entry;
+       int i, rc;
+       bool matched = false;
+
+       ENTRY;
+
+       if (nid_count >= MTI_NIDS_MAX) {
+               CDEBUG(D_NET, "too many NIDs (%d) for UUID '%s'\n",
+                       nid_count, obd_uuid2str(uuid));
+               return -ENOSPC;
+       }
+
+       spin_lock(&g_uuid_lock);
+       list_for_each_entry(entry, &g_uuid_list, un_list) {
+               CDEBUG(D_NET, "Comparing %s with %s\n",
+                      obd_uuid2str(uuid), obd_uuid2str(&entry->un_uuid));
+
+               if (!obd_uuid_equals(&entry->un_uuid, uuid))
+                       continue;
+
+               matched = true;
+               CDEBUG(D_NET, "Updating UUID '%s'\n", obd_uuid2str(uuid));
+               for (i = 0; i < nid_count; i++)
+                       entry->un_nids[i] = nids[i];
+               entry->un_nid_count = nid_count;
+               break;
+       }
+       spin_unlock(&g_uuid_lock);
+       if (matched) {
+               rc = LNetAddPeer(entry->un_nids, entry->un_nid_count);
+               CDEBUG(D_INFO, "Add peer %s rc = %d\n",
+                      libcfs_nid2str(entry->un_nids[0]), rc);
+       }
+
+       RETURN(0);
+}
+EXPORT_SYMBOL(class_add_nids_to_uuid);
+
 /* check if @nid exists in nid list of @uuid */
 int class_check_uuid(struct obd_uuid *uuid, __u64 nid)
 {