From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
Date: 10 Jan 2007 20:06:27 -0000 [thread overview]
Message-ID: <20070110200627.26504.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-01-10 20:06:26
Modified files:
luci/site/luci/Extensions: cluster_adapters.py
Log message:
code to propagate node fence config changes
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.196&r2=1.197
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/01/10 16:00:42 1.196
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/01/10 20:06:26 1.197
@@ -23,6 +23,7 @@
from QuorumD import QuorumD
from Heuristic import Heuristic
from clusterOS import resolveOSType
+from Fence import Fence
from Method import Method
from FenceDevice import FenceDevice
from Device import Device
@@ -1448,7 +1449,7 @@
try:
fence_level = int(request.form['fence_level'].strip())
except Exception, e:
- luci_log.debug_verbose('vNFC0a: no fence level: %s' % str(e))
+ luci_log.debug_verbose('vNFC1: no fence level: %s' % str(e))
return (False, {'errors': ['No fence level was supplied.']})
try:
@@ -1456,7 +1457,7 @@
if not nodename:
raise Exception, 'nodename is blank'
except Exception, e:
- luci_log.debug_verbose('vNFC1: no nodename: %s' % str(e))
+ luci_log.debug_verbose('vNFC2: no nodename: %s' % str(e))
return (False, {'errors': ['No node name was given.']})
try:
@@ -1464,7 +1465,7 @@
if not clustername:
raise Exception, 'clustername is blank'
except Exception, e:
- luci_log.debug_verbose('vNFC2: no clustername: %s' % str(e))
+ luci_log.debug_verbose('vNFC3: no clustername: %s' % str(e))
return (False, {'errors': ['No cluster name was given.']})
try:
@@ -1479,7 +1480,7 @@
model = None
if model is None:
- luci_log.debug_verbose('vNFC2a: unable to get model for cluster %s' % clustername)
+ luci_log.debug_verbose('vNFC4: unable to get model for cluster %s' % clustername)
return (False, {'errors': ['No cluster model was found.']})
try:
@@ -1488,15 +1489,30 @@
if len(forms) < 1:
raise
except Exception, e:
- luci_log.debug_verbose('vNFC2b: error: %s' % str(e))
+ luci_log.debug_verbose('vNFC5: error: %s' % str(e))
return (False, {'errors': ['The fence data submitted is not properly formed.']})
+ try:
+ node = model.retrieveNodeByName(nodename)
+ except GeneralError, e:
+ luci_log.debug_verbose('vNFC6: unable to find node name %s in current node list' % (str(nodename), str(e)))
+ return (False, {'errors': ['Unable to find the cluster node %s in the node list.' % str(nodename) ]})
+
+ fence_level_num = int(fence_level)
+ levels = node.getFenceLevels()
+ try:
+ method_id = levels[fence_level_num - 1].getAttribute('name')
+ if not method_id:
+ raise Exception, 'No method ID'
+ except Exception, e:
+ method_id = fence_level
+
fence_method = Method()
- fence_method.addAttribute('name', str(fence_level))
+ fence_method.addAttribute('name', str(method_id))
form_hash = {}
for i in forms:
- form_id = i.getAttribute('name')
+ form_id = i.getAttribute('id')
if not form_id:
continue
ielems = i.getElementsByTagName('input')
@@ -1509,7 +1525,7 @@
try:
input_type = str(i.getAttribute('type'))
except Exception, e:
- luci_log.debug_verbose('vNFC4: input type: %s' % str(e))
+ luci_log.debug_verbose('vNFC7: input type: %s' % str(e))
continue
if not input_type or input_type == 'button':
@@ -1518,19 +1534,24 @@
try:
dummy_form[str(i.getAttribute('name'))] = str(i.getAttribute('value'))
except Exception, e:
- luci_log.debug_verbose('vNFC5: parsing XML: %s' % str(e))
+ luci_log.debug_verbose('vNFC8: parsing XML: %s' % str(e))
if len(dummy_form) < 1:
continue
- if 'instance' in dummy_form:
+ if 'fence_instance' in dummy_form:
try:
parent = dummy_form['parent_fencedev']
- parent_form = form_hash[parent][1].append(dummy_form)
except:
- luci_log.debug_verbose('vNFC6: no parent for instance: %s' \
- % dummy_form['name'])
- raise Exception, 'instance has no owner'
+ luci_log.debug_verbose('vNFC9: no parent for instance')
+ return (False, {'errors': [ 'Unable to determine what device the current instance uses.' ]})
+
+ try:
+ parent_form = form_hash[parent][1].append(dummy_form)
+ del dummy_form['fence_instance']
+ except Exception, e:
+ luci_log.debug_verbose('vNFC10: no parent for instance')
+ return (False, {'errors': [ 'Unable to determine what device the current instance uses.' ]})
else:
form_hash[form_id] = (dummy_form, list())
@@ -1542,7 +1563,7 @@
try:
fence_form, instance_list = form_hash[i]
except Exception, e:
- luci_log.debug_verbose('vNFC7: %s' % str(e))
+ luci_log.debug_verbose('vNFC11: %s' % str(e))
continue
try:
@@ -1551,7 +1572,7 @@
raise Exception, 'fence type is blank'
fence_form['agent'] = fence_type
except Exception, e:
- luci_log.debug_verbose('vNFC8: %s' % str(e))
+ luci_log.debug_verbose('vNFC12: %s %s' % (i, str(e)))
fence_type = None
try:
@@ -1559,9 +1580,9 @@
except:
pass
- fencedev_name = fence_form['name']
if 'existing_device' in fence_form:
del fence_form['existing_device']
+ fencedev_name = fence_form['name']
if fence_type is None:
# An unknown device. Pull the data out of
@@ -1584,18 +1605,36 @@
raise Exception, 'old name is blank'
del fence_form['old_name']
except Exception, e:
- luci_log.debug_verbose('vNFC8: no old name for %s %s' \
+ luci_log.debug_verbose('vNFC12: no old name for %s %s' \
% (fence_form['name'], str(e)))
+ return (False, {'errors': [ 'Unable to determine the original name for the device now named %s' % fencedev_name ]})
+
+ fence_dev_list = model.getFenceDevices()
+ fencedev_obj = None
+ for fd in fence_dev_list:
+ if fd.getAttribute('name') == 'old_name':
+ fencedev_obj = fd
+ try:
+ model.fencedevices_ptr.removeChild(fd)
+ except Exception, e:
+ luci_log.debug_verbose('VNFC8a: %s: %s' \
+ % (old_name, str(e)))
+ return (False, {'errors': [ 'Unable to remove old fence device %s' % old_name ]})
+ break
+ if fencedev_obj is None:
+ luci_log.debug_verbose('vNFC14: no fence device named %s was found' % old_name)
+ return (False, {'errors': ['No fence device named %s was found' % old_name ] })
- fencedev_obj = FenceDevice()
for k in fence_form.keys():
- fencedev_obj.addAttribute(k, fence_form[k])
+ if fence_form[k]:
+ fencedev_obj.addAttribute(k, str(fence_form[k]))
else:
# The user created a new fence device.
fencedev_name = fence_form['name']
fencedev_obj = FenceDevice()
for k in fence_form.keys():
- fencedev_obj.addAttribute(k, fence_form[k])
+ if fence_form[k]:
+ fencedev_obj.addAttribute(k, str(fence_form[k]))
if fencedev_obj is not None:
# If a device with this name exists in the model
@@ -1603,31 +1642,81 @@
# this block is not executed, we don't need to make
# any changes to the fencedevices block for this
# device
- pass
+ fence_dev_list = model.getFenceDevices()
+ for fd in fence_dev_list:
+ if fencedev_name == fd.getAttribute('name'):
+ luci_log.debug_verbose('vNFC15: fence ident %s already in use' % fencedev_name)
+ return (False, {'errors': ['There is already a fence device named %s' % fencedev_name ] })
+ model.fencedevices_ptr.addChild(fencedev_obj)
if fencedev_unknown is True:
# Save any instances for this fence device.
pass
for inst in instance_list:
- new_instance = not 'existing_instance' in inst
try:
- del inst['new_instance']
del inst['parent_fencedev']
- del inst['existing_instance']
+ except:
+ pass
+ try:
+ del inst['new_instance']
+ except:
+ pass
+ try:
del inst['name']
except:
pass
+ try:
+ del inst['existing_instance']
+ except:
+ pass
device_obj = Device()
device_obj.setAgentType(fence_type)
device_obj.addAttribute('name', fencedev_name)
- for k in new_instance.keys():
- device_obj.addAttribute(k, inst[k])
+ for k in inst.keys():
+ if inst[k]:
+ device_obj.addAttribute(k, str(inst[k]))
fence_method.addChild(device_obj)
- luci_log.debug_verbose('vNFC7: got xml: %s' % doc.toprettyxml())
- return (False, { 'errors': [ doc.toprettyxml() ]})
+ try:
+ levels[fence_level_num - 1] = fence_method
+ except:
+ fence_node = Fence()
+ fence_node.addChild(fence_method)
+ node.addChild(fence_node)
+
+ try:
+ cp = model.getClusterPtr()
+ cp.incrementConfigVersion()
+ model.setModified(True)
+ conf = str(model.exportModelAsString())
+ if not conf:
+ raise Exception, 'model string is blank'
+ luci_log.debug_verbose('vNFC16: exported \"%s\"' % conf)
+ except Exception, e:
+ luci_log.debug_verbose('vNFC17: exportModelAsString failed: %s' \
+ % str(e))
+ return (False, {'errors': [ 'An error occurred while constructing the new cluster configuration.' ]})
+
+ rc = getRicciAgent(self, clustername)
+ if not rc:
+ luci_log.debug_verbose('vNFC18: unable to find a ricci agent for cluster %s' % clustername)
+ return (False, {'errors': ['Unable to find a ricci agent for the %s cluster' % clustername ]})
+ ragent = rc.hostname()
+
+ batch_number, result = setClusterConf(rc, conf)
+ if batch_number is None or result is None:
+ luci_log.debug_verbose('vNFC19: missing batch and/or result')
+ return (False, {'errors': [ 'An error occurred while constructing the new cluster configuration.' ]})
+
+ try:
+ set_node_flag(self, clustername, ragent, str(batch_number), FENCEDEV_NODE_CONFIG, "Updating fence configuration for node \'%s\'" % nodename)
+ except Exception, e:
+ luci_log.debug_verbose('vNFC20: failed to set flags: %s' % str(e))
+
+ response = request.RESPONSE
+ response.redirect(request['URL'] + "?pagetype=" + NODE + "&clustername=" + clustername + '&nodename=' + nodename + '&busyfirst=true')
def deleteFenceDevice(self, request):
errors = list()
next reply other threads:[~2007-01-10 20:06 UTC|newest]
Thread overview: 185+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-10 20:06 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-07-17 16:36 [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte rmccabe
2008-04-18 20:37 rmccabe
2007-12-12 15:45 rmccabe
2007-08-23 19:00 rmccabe
2007-08-22 20:57 rmccabe
2007-05-03 19:51 rmccabe
2007-04-02 16:35 rmccabe
2007-04-02 15:56 rmccabe
2007-03-27 2:03 rmccabe
2007-03-16 3:19 rmccabe
2007-03-16 3:19 rmccabe
2007-03-16 3:19 rmccabe
2007-03-13 3:07 rmccabe
2007-03-13 3:06 rmccabe
2007-03-12 5:47 rmccabe
2007-03-12 5:46 rmccabe
2007-03-12 5:46 rmccabe
2007-03-06 22:48 rmccabe
2007-03-01 20:22 rmccabe
2007-03-01 20:22 rmccabe
2007-03-01 20:22 rmccabe
2007-02-13 19:50 rmccabe
2007-02-13 19:50 rmccabe
2007-02-12 20:25 rmccabe
2007-02-12 20:24 rmccabe
2007-02-07 22:00 rmccabe
2007-02-07 21:30 rmccabe
2007-02-05 19:56 rmccabe
2007-01-31 23:45 rmccabe
2007-01-31 19:28 rmccabe
2007-01-31 18:50 rmccabe
2007-01-30 21:41 jparsons
2007-01-30 21:21 jparsons
2007-01-30 21:05 jparsons
2007-01-29 23:30 rmccabe
2007-01-26 19:35 rmccabe
2007-01-18 2:48 rmccabe
2007-01-17 22:26 rmccabe
2007-01-17 22:14 rmccabe
2007-01-10 23:33 jparsons
2007-01-10 22:45 rmccabe
2006-12-20 20:40 jparsons
2006-12-14 21:37 rmccabe
2006-12-14 17:03 rmccabe
2006-12-08 23:02 rmccabe
2006-11-30 20:12 jparsons
2006-11-27 21:06 rmccabe
2006-11-27 21:05 rmccabe
2006-11-27 18:15 rmccabe
2006-11-20 23:32 rmccabe
2006-11-20 15:05 jparsons
2006-11-17 5:50 rmccabe
2006-11-17 5:48 rmccabe
2006-11-10 18:18 rmccabe
2006-11-10 17:59 rmccabe
2006-11-09 22:30 rmccabe
2006-11-09 14:17 rmccabe
2006-11-08 21:42 rmccabe
2006-11-08 15:52 jparsons
2006-11-07 20:14 jparsons
2006-11-07 20:13 jparsons
2006-11-07 2:36 jparsons
2006-11-07 1:32 jparsons
2006-11-06 23:55 rmccabe
2006-11-05 0:59 rmccabe
2006-11-03 21:13 jparsons
2006-11-03 1:24 rmccabe
2006-11-03 1:08 rmccabe
2006-11-02 20:58 rmccabe
2006-11-02 20:45 rmccabe
2006-11-02 20:41 rmccabe
2006-11-02 3:17 rmccabe
2006-10-31 17:18 rmccabe
2006-10-31 0:16 rmccabe
2006-10-30 22:52 rmccabe
2006-10-30 20:43 jparsons
2006-10-27 1:11 rmccabe
2006-10-25 0:43 rmccabe
2006-10-24 14:08 rmccabe
2006-10-23 20:47 jparsons
2006-10-20 22:09 rmccabe
2006-10-20 21:59 rmccabe
2006-10-19 14:57 rmccabe
2006-10-18 23:12 rmccabe
2006-10-18 19:16 rmccabe
2006-10-16 21:01 rmccabe
2006-10-16 20:51 jparsons
2006-10-16 19:17 jparsons
2006-10-16 5:28 rmccabe
2006-10-16 4:54 rmccabe
2006-10-16 4:51 rmccabe
2006-10-13 22:56 rmccabe
2006-10-12 22:11 jparsons
2006-10-12 21:00 kupcevic
2006-10-12 20:54 jparsons
2006-10-12 20:48 jparsons
2006-10-12 19:40 rmccabe
2006-10-12 17:27 jparsons
2006-10-12 17:08 jparsons
2006-10-12 15:50 jparsons
2006-10-12 15:45 jparsons
2006-10-12 0:04 jparsons
2006-10-11 23:56 jparsons
2006-10-11 23:11 jparsons
2006-10-11 23:08 rmccabe
2006-10-11 22:37 jparsons
2006-10-11 20:58 jparsons
2006-10-11 17:43 jparsons
2006-10-11 17:29 rmccabe
2006-10-11 16:35 jparsons
2006-10-11 16:25 jparsons
2006-10-11 16:18 rmccabe
2006-10-10 21:33 kupcevic
2006-10-09 20:21 rmccabe
2006-10-04 16:20 rmccabe
2006-10-04 16:05 jparsons
2006-10-04 15:11 jparsons
2006-10-02 22:30 rmccabe
2006-10-02 21:42 rmccabe
2006-10-02 21:09 rmccabe
2006-10-02 20:53 rmccabe
2006-09-28 22:04 rmccabe
2006-09-28 20:10 rmccabe
2006-09-27 18:46 rmccabe
2006-09-27 16:18 jparsons
2006-09-27 15:51 jparsons
2006-09-27 15:35 jparsons
2006-09-25 22:59 rmccabe
2006-09-22 18:24 rmccabe
2006-08-30 22:59 rmccabe
2006-08-22 17:46 jparsons
2006-08-22 17:41 jparsons
2006-08-16 23:40 jparsons
2006-08-16 21:56 jparsons
2006-08-16 21:54 jparsons
2006-08-16 21:51 jparsons
2006-08-16 19:14 rmccabe
2006-08-16 16:10 jparsons
2006-08-14 15:12 jparsons
2006-08-13 19:38 jparsons
2006-08-13 19:37 jparsons
2006-08-13 18:36 jparsons
2006-08-13 16:32 jparsons
2006-08-13 16:15 jparsons
2006-08-13 15:02 jparsons
2006-08-13 14:57 jparsons
2006-08-13 13:48 jparsons
2006-08-12 21:13 jparsons
2006-08-12 20:31 jparsons
2006-08-12 18:22 jparsons
2006-08-12 17:53 jparsons
2006-08-11 0:29 jparsons
2006-08-10 23:06 shuennek
2006-08-10 16:50 jparsons
2006-08-10 14:16 jparsons
2006-08-09 22:05 jparsons
2006-08-09 21:48 jparsons
2006-08-03 13:37 jparsons
2006-08-02 18:59 rmccabe
2006-08-02 17:25 rmccabe
2006-08-01 15:29 jparsons
2006-08-01 15:25 jparsons
2006-08-01 15:20 jparsons
2006-08-01 15:13 jparsons
2006-08-01 15:04 jparsons
2006-07-31 18:21 rmccabe
2006-07-28 19:03 jparsons
2006-07-28 18:57 jparsons
2006-07-28 18:40 jparsons
2006-07-28 14:16 jparsons
2006-07-28 14:02 jparsons
2006-07-28 11:46 jparsons
2006-07-27 16:34 jparsons
2006-07-27 15:53 rmccabe
2006-07-25 20:16 jparsons
2006-07-25 20:01 jparsons
2006-07-25 0:56 jparsons
2006-07-24 21:51 jparsons
2006-07-24 21:13 jparsons
2006-07-24 19:50 jparsons
2006-07-19 22:28 rmccabe
2006-07-19 21:38 rmccabe
2006-07-19 20:57 rmccabe
2006-07-19 20:19 rmccabe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070110200627.26504.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.