From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 21 May 2009 13:33:23 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/cluster_ ... Message-ID: <20090521133323.19286.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Branch: RHEL5 Changes by: rmccabe at sourceware.org 2009-05-21 13:33:19 Modified files: . : conga.spec.in.in luci/cluster : cluster_config-macros cluster_svc-macros resource-form-macros resource_form_handlers.js luci/site/luci/Extensions: LuciClusterInfo.py LuciValidation.py ResourceHandler.py luci/site/luci/var: Data.fs Log message: - Fix bz469965 (Adding existing fence device fails) - Fix bz499741 (updating qdisk partition global settings wipes out heuristics) - Fix bz495109 (Need xen/kvm flag for conga UI) Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.115&r2=1.45.2.116 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_config-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.5&r2=1.3.2.6 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_svc-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.11&r2=1.3.2.12 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.15&r2=1.21.2.16 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.20.2.17&r2=1.20.2.18 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterInfo.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.18&r2=1.1.4.19 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciValidation.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.6.2.11&r2=1.6.2.12 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.7&r2=1.1.4.8 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.42&r2=1.15.2.43 --- conga/conga.spec.in.in 2009/05/14 21:05:58 1.45.2.115 +++ conga/conga.spec.in.in 2009/05/21 13:32:03 1.45.2.116 @@ -325,6 +325,8 @@ %changelog * Thu May 14 2009 Ryan McCabe 0.12.2-6 - Fix bz469965 (Adding existing fence device fails) +- Fix bz499741 (updating qdisk partition global settings wipes out heuristics) +- Fix bz495109 (Need xen/kvm flag for conga UI) * Thu Apr 23 2009 Ryan McCabe 0.12.2-5 - Fix bz492392 (Conga Interface for Fence Agents Requires Password even when Password Script is Specified) --- conga/luci/cluster/cluster_config-macros 2009/02/16 17:23:27 1.3.2.5 +++ conga/luci/cluster/cluster_config-macros 2009/05/21 13:32:03 1.3.2.6 @@ -819,15 +819,14 @@ + tal:define="global curHeur python:int(0)"> + tal:attributes="id python: 'heuristic' + str(curHeur)"> + + --- conga/luci/cluster/cluster_svc-macros 2009/05/14 21:05:58 1.3.2.11 +++ conga/luci/cluster/cluster_svc-macros 2009/05/21 13:32:04 1.3.2.12 @@ -166,6 +166,19 @@ + + + Hypervisor + + + + @@ -207,6 +220,9 @@ + +
@@ -295,6 +311,23 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Hypervisor +
@@ -577,7 +610,7 @@
Recovery policy - - + @@ -203,7 +203,7 @@ - + @@ -286,9 +286,13 @@ + + +

Resource details for

@@ -327,6 +331,9 @@ src="/luci/cluster/resource_form_handlers.js"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name of the SAP START profile @@ -1338,6 +1346,84 @@ value res/attrs/START_PROFILE | nothing" />
+ Number of seconds to wait before checking startup status + + +
+ Enable automatic startup recovery + + +
+ Path to a pre-start script + + +
+ Path to a post-start script + + +
+ Path to a pre-stop script + + +
+ Path to a post-stop script + + +
@@ -1665,6 +1751,106 @@
Application Level Monitoring + +
Automatic Startup Recovery + +
+ Path to Java SDK + + +
+ File name of the JDBC driver + + +
+ Path to a pre-start script + + +
+ Path to a post-start script + + +
+ Path to a pre-stop script + + +
+ Path to a post-stop script + + +
J2EE instance bootstrap directory --- conga/luci/cluster/resource_form_handlers.js 2009/04/27 21:03:32 1.20.2.17 +++ conga/luci/cluster/resource_form_handlers.js 2009/05/21 13:32:04 1.20.2.18 @@ -471,6 +471,17 @@ var submit_btn = null; +function set_recovery_type(form) { + recovery = form.recovery.options[form.recovery.options.selectedIndex].value; + if (recovery != 'restart') { + form.max_restarts.disabled = true; + form.restart_expire_time.disabled = true; + } else { + form.max_restarts.disabled = false; + form.restart_expire_time.disabled = false; + } +} + function forms_to_xml(submit_button, master_form) { var errors = new Array(); var form_xml = ''; --- conga/luci/site/luci/Extensions/LuciClusterInfo.py 2009/04/27 21:03:32 1.1.4.18 +++ conga/luci/site/luci/Extensions/LuciClusterInfo.py 2009/05/21 13:32:04 1.1.4.19 @@ -603,17 +603,25 @@ clumap = {} clumap['has_ignore_undef_fence'] = False + clumap['sap_agent_v19'] = False + clumap['has_qemu'] = False + clumap['has_sybase_agent'] = False try: cluster_os = model.getClusterOS() if cluster_os.find('Tikanga') != -1: clumap['os_major'] = 5 os_minor = int(cluster_os[cluster_os.find('5.') + 2]) clumap['os_minor'] = os_minor + if os_minor > 0: + clumap['has_sybase_agent'] = True if os_minor > 1: clumap['vm_migration_choice'] = True if os_minor > 2: clumap['has_fence_ssh'] = True #clumap['has_ignore_undef_fence'] = True + if os_minor > 3: + clumap['sap_agent_v19'] = True + clumap['has_qemu'] = True elif cluster_os.find('Nahant') != -1: clumap['os_major'] = 4 os_minor = int(cluster_os[cluster_os.find('Update ') + 7]) --- conga/luci/site/luci/Extensions/LuciValidation.py 2009/04/27 21:03:32 1.6.2.11 +++ conga/luci/site/luci/Extensions/LuciValidation.py 2009/05/21 13:32:04 1.6.2.12 @@ -1108,7 +1108,7 @@ def validate_vmsvc_form(model, request): errors = list() - fvar = GetReqVars(request, [ 'vmname', 'oldname', 'vmpath', 'recovery', 'domain', 'migration_type', 'max_restarts', 'restart_expire_time', 'migration_mapping']) + fvar = GetReqVars(request, [ 'vmname', 'oldname', 'vmpath', 'recovery', 'domain', 'migration_type', 'max_restarts', 'restart_expire_time', 'migration_mapping', 'hypervisor' ]) vm_name = fvar['vmname'] if vm_name is None: @@ -1227,6 +1227,14 @@ except: pass + hypervisor = fvar['hypervisor'] + if hypervisor == 'xen': + xvm.addAttribute('hypervisor', 'xen') + elif hypervisor == 'qemu': + xvm.addAttribute('hypervisor', 'qemu') + else: + xvm.removeAttribute('hypervisor') + fdom = fvar['domain'] if fdom: xvm.addAttribute('domain', fdom) --- conga/luci/site/luci/Extensions/ResourceHandler.py 2009/01/23 19:33:29 1.1.4.7 +++ conga/luci/site/luci/Extensions/ResourceHandler.py 2009/05/21 13:32:04 1.1.4.8 @@ -710,13 +710,14 @@ if LUCI_DEBUG_MODE is True: luci_log.debug_verbose('addSAPD1: %s' % err) - if form.has_key('DBJ2EE_ONLY'): - res.addAttribute('DBJ2EE_ONLY', 'TRUE') - else: - res.removeAttribute('DBJ2EE_ONLY') - + for param in ( 'DBJ2EE_ONLY', 'AUTOMATIC_RECOVER', 'STRICT_MONITORING' ): + if form.has_key(param): + res.addAttribute(param, 'true') + else: + res.removeAttribute(param) + # Optional string parameters - for param in ( 'DIR_EXECUTABLE', 'NETSERVICENAME', 'DIR_BOOTSTRAP', 'DIR_SECSTORE' ): + for param in ( 'DIR_EXECUTABLE', 'NETSERVICENAME', 'DIR_BOOTSTRAP', 'DIR_SECSTORE', 'JAVA_HOME', 'DB_JARS', 'PRE_START_USEREXIT', 'POST_START_USEREXIT', 'PRE_STOP_USEREXIT', 'POST_STOP_USEREXIT' ): try: pval = form[param].strip() if not pval: @@ -737,8 +738,13 @@ res.removeAttribute('name') res.addAttribute('InstanceName', rname) + if form.has_key('AUTOMATIC_RECOVER'): + res.addAttribute('AUTOMATIC_RECOVER', 'true') + else: + res.removeAttribute('AUTOMATIC_RECOVER') + # Optional string parameters - for param in ( 'DIR_EXECUTABLE', 'DIR_PROFILE', 'START_PROFILE' ): + for param in ( 'DIR_EXECUTABLE', 'DIR_PROFILE', 'START_PROFILE', 'PRE_START_USEREXIT', 'POST_START_USEREXIT', 'PRE_STOP_USEREXIT', 'POST_STOP_USEREXIT', 'START_WAITTIME' ): try: pval = form[param].strip() if not pval: Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs 2009/03/24 20:08:19 1.15.2.42 and /cvs/cluster/conga/luci/site/luci/var/Data.fs 2009/05/21 13:32:05 1.15.2.43 differ rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed