From 969e4a70b277fa96f114b4edcf1ff7ddd1bc319b Mon Sep 17 00:00:00 2001
From: rread <rread>
Date: Tue, 29 Oct 2002 22:01:20 +0000
Subject: [PATCH] * support for toenal * support for more than one mds client
---
lustre/utils/lconf | 27 ++++++++++++++-------------
lustre/utils/lmc | 4 ++--
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index a0b90ab340..a054ce0208 100755
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -328,7 +328,6 @@ class LCTLInterface:
self.run(cmds)
- # add a route to a range
def del_route(self, net, gw, lo, hi):
cmds = """
ignore_errors
@@ -755,8 +754,11 @@ class Network(Module):
def prepare(self):
self.info(self.net_type, self.nid, self.port)
- if self.net_type == 'tcp':
- ret, out = run(TCP_ACCEPTOR, '-s', self.send_mem, '-r', self.recv_mem, self.port)
+ if self.net_type in ('tcp', 'toe'):
+ nal_id = '' # default is socknal
+ if self.net_type == 'toe':
+ nal_id = '-N 4'
+ ret, out = run(TCP_ACCEPTOR, '-s', self.send_mem, '-r', self.recv_mem, nal_id, self.port)
if ret:
raise CommandError(TCP_ACCEPTOR, out, ret)
ret = self.dom_node.getElementsByTagName('route_tbl')
@@ -946,8 +948,8 @@ class MDC(Module):
self._connected = 0
host = socket.gethostname()
- self.name = 'MDC_'+host
- self.uuid = self.name+'_UUID'
+ self.name = 'MDC_%s_%s' % ( host, self.mds.name )
+ self.uuid = self.name + '_UUID'
self.lookup_server(self.mds.uuid)
self.add_module('lustre/mdc', 'mdc')
@@ -1070,8 +1072,7 @@ class Mountpoint(Module):
def prepare(self):
self.osc.prepare()
mdc_uuid = prepare_mdc(self.dom_node.parentNode, self.mds_uuid)
-
- self.info(self.path, self.mds_uuid,self.lov_uuid)
+ self.info(self.path, self.mds_uuid, self.lov_uuid)
cmd = "mount -t lustre_lite -o osc=%s,mdc=%s none %s" % \
(self.lov_uuid, mdc_uuid, self.path)
run("mkdir", self.path)
@@ -1271,18 +1272,18 @@ def getByName(lustreNode, name, tag):
# MDC UUID hack -
# FIXME: clean this mess up!
#
-mdc_uuid = None
+saved_mdc = {}
def prepare_mdc(dom_node, mds_uuid):
- global mdc_uuid
+ global saved_mdc
mds_node = lookup(dom_node, mds_uuid);
if not mds_node:
panic("no mds:", mds_uuid)
- if mdc_uuid:
- return mdc_uuid
+ if saved_mdc.has_key(mds_uuid):
+ return saved_mdc[mds_uuid]
mdc = MDC(mds_node)
mdc.prepare()
- mdc_uuid = mdc.uuid
- return mdc_uuid
+ saved_mdc[mds_uuid] = mdc.uuid
+ return mdc.uuid
mdc_cleaned = None
def cleanup_mdc(dom_node, mds_uuid):
diff --git a/lustre/utils/lmc b/lustre/utils/lmc
index bb6377f33d..6f34b2b84a 100755
--- a/lustre/utils/lmc
+++ b/lustre/utils/lmc
@@ -64,7 +64,7 @@ Commands:
specifies the node to modify.
--net hostname nettype [port, recv_buf, send_buf]
- Nettype is either tcp, elan, or gm.
+ Nettype is either tcp, toe, elan, or gm.
Requires --node
--route net gw lo [hi]
@@ -423,7 +423,7 @@ def add_net(gen, lustre, options, args):
port = 0
tcpbuf = 0
- if net_type == 'tcp':
+ if net_type in ('tcp', 'toe'):
if len(args) > 2:
port = int(args[2])
else:
--
GitLab