struct lprocfs_counter ret;
struct obd_device *obd = (struct obd_device *)data;
struct obd_import *imp;
+ struct obd_import_conn *conn;
int i, j, k, rw = 0;
LASSERT(obd != NULL);
"import:\n"
" name: %s\n"
" target: %s\n"
- " current_connection: %s\n"
" state: %s\n"
" connect_flags: [",
obd->obd_name,
obd2cli_tgt(obd),
- imp->imp_connection->c_remote_uuid.uuid,
ptlrpc_import_state_name(imp->imp_state));
i += obd_connect_flags2str(page + i, count - i,
imp->imp_connect_data.ocd_connect_flags,
i += snprintf(page + i, count - i,
"]\n"
" connection:\n"
+ " failover_nids: [");
+ spin_lock(&imp->imp_lock);
+ j = 0;
+ list_for_each_entry(conn, &imp->imp_conn_list, oic_item) {
+ i += snprintf(page + i, count - i, "%s%s", j ? ", " : "",
+ libcfs_nid2str(conn->oic_conn->c_peer.nid));
+ j++;
+ }
+ spin_unlock(&imp->imp_lock);
+ i += snprintf(page + i, count - i,
+ "]\n"
+ " current_connection: %s\n"
" connection_attempts: %u\n"
" generation: %u\n"
" in-progress_invalidations: %u\n",
+ libcfs_nid2str(imp->imp_connection->c_peer.nid),
imp->imp_conn_cnt,
imp->imp_generation,
atomic_read(&imp->imp_inval_count));
err = ptlrpc_uuid_to_peer(uuid, &peer, &self);
if (err != 0) {
- CERROR("cannot find peer %s!\n", uuid->uuid);
+ CDEBUG(D_NETERROR, "cannot find peer %s!\n", uuid->uuid);
return NULL;
}
}
CDEBUG(D_NET,"%s->%s\n", uuid->uuid, libcfs_id2str(*peer));
- if (rc != 0)
- CERROR("No NID found for %s\n", uuid->uuid);
return rc;
}
}
run_test 29 "permanently remove an OST"
-test_30() {
+test_30a() {
setup
echo Big config llog
# make sure client restart still works
umount_client $MOUNT
mount_client $MOUNT || return 4
- [ "$($TEST)" -ne "$i" ] && return 5
+ [ "$($TEST)" -ne "$i" ] && error "Param didn't stick across restart $($TEST) != $i"
pass
echo Erase parameter setting
cleanup
}
-run_test 30 "Big config llog and conf_param deletion"
+run_test 30a "Big config llog and conf_param deletion"
+
+test_30b() {
+ setup
+
+ NEW="1.2.3.4@tcp"
+ TEST="lctl get_param -n osc.$FSNAME-OST0000-osc-[^M]*.import | grep failover_nids | sed -n 's/.*\($NEW\).*/\1/p'"
+ set_and_check client "$TEST" "$FSNAME-OST0000.failover.node" $NEW || error "didn't add failover nid $NEW"
+ NIDS=$($LCTL get_param -n osc.$FSNAME-OST0000-osc-[^M]*.import | grep failover_nids)
+ echo $NIDS
+ NIDCOUNT=$(($(echo "$NIDS" | wc -w) - 1))
+ echo "should have 2 failover nids: $NIDCOUNT"
+ [ $NIDCOUNT -eq 2 ] || error "Failover nid not added"
+ do_facet mgs "$LCTL conf_param -d $FSNAME-OST0000.failover.node" || error "conf_param delete failed"
+ umount_client $MOUNT
+ mount_client $MOUNT || return 3
+
+ NIDS=$($LCTL get_param -n osc.$FSNAME-OST0000-osc-[^M]*.import | grep failover_nids)
+ echo $NIDS
+ NIDCOUNT=$(($(echo "$NIDS" | wc -w) - 1))
+ echo "only 1 final nid should remain: $NIDCOUNT"
+ [ $NIDCOUNT -eq 1 ] || error "Failover nids not removed"
+
+ cleanup
+}
+run_test 30b "Remove failover nids"
test_31() { # bug 10734
# ipaddr must not exist