diff options
| author |   Alexander Boyko <alexander.boyko@seagate.com> | 2016-09-18 16:38:18 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 10:03:40 +0200 |
| commit | bc875120b983bf7b297720ce384d6e20f0068ba8 (patch) | |
| tree | 3cce85b365615348f9f777a48262e1f2fe7486e2 /drivers/staging/lustre/lustre/mgc | |
| parent | staging: lustre: ptlrpc: fix race between connect vs resend (diff) | |
| download | linux-dev-bc875120b983bf7b297720ce384d6e20f0068ba8.tar.xz linux-dev-bc875120b983bf7b297720ce384d6e20f0068ba8.zip | |
staging: lustre: mgc: add nid iteration
mgc_apply_recover_logs use only first nid from entry,
this could be the problem for a cluster with several network
address for a one node.
Signed-off-by: Alexander Boyko <alexander.boyko@seagate.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5950
Xyratex-bug-id: MRP-2255
Reviewed-on: http://review.whamcloud.com/12829
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
Reviewed-by: Ann Koehler <amk@cray.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/mgc')
| -rw-r--r-- | drivers/staging/lustre/lustre/mgc/mgc_request.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index 2191ca1fdade..23374cae5133 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -1159,7 +1159,7 @@ static int mgc_apply_recover_logs(struct obd_device *mgc, while (datalen > 0) { int entry_len = sizeof(*entry); - int is_ost; + int is_ost, i; struct obd_device *obd; char *obdname; char *cname; @@ -1265,11 +1265,17 @@ static int mgc_apply_recover_logs(struct obd_device *mgc, continue; } - /* TODO: iterate all nids to find one */ + /* iterate all nids to find one */ /* find uuid by nid */ - rc = client_import_find_conn(obd->u.cli.cl_import, - entry->u.nids[0], - (struct obd_uuid *)uuid); + rc = -ENOENT; + for (i = 0; i < entry->mne_nid_count; i++) { + rc = client_import_find_conn(obd->u.cli.cl_import, + entry->u.nids[0], + (struct obd_uuid *)uuid); + if (!rc) + break; + } + up_read(&obd->u.cli.cl_sem); if (rc < 0) { CERROR("mgc: cannot find uuid by nid %s\n", |