conga-luci-1stgen-commits August 2012

conga-luci-1stgen-commits@lists.fedorahosted.org

2 participants
9 discussions

[conga-luci-1stgen] RHEL5-active: ricci: daemon_init: remove unused assignment (06e5580)
by jpokorny＠fedorahosted.org 15 Aug '12

15 Aug '12

Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git On branch : RHEL5-active >--------------------------------------------------------------- commit 06e5580625b7d9304585a6f07da5cf2564621041 Author: Jan Pokorný <jpokorny(a)redhat.com> Date: Wed Aug 15 16:54:06 2012 +0200 ricci: daemon_init: remove unused assignment Origin of the change: http://git.fedorahosted.org/cgit/cluster.git/commit/?h=STABLE32&id=06bed15 Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> >--------------------------------------------------------------- ricci/common/daemon_init.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ricci/common/daemon_init.c b/ricci/common/daemon_init.c index 11a3a32..5737249 100644 --- a/ricci/common/daemon_init.c +++ b/ricci/common/daemon_init.c @@ -110,11 +110,11 @@ check_pid_valid(pid_t pid, char *prog) /* * Check to see if this is the same executable. */ - if ((s = strstr(proc_cmdline, prog)) == NULL) { + if (strstr(proc_cmdline, prog) == NULL) { return 0; - } else { - return 1; } + + return 1; }

1 0

[conga-luci-1stgen] RHEL5-active: ricci: daemon_init: further unify with rgmanager's one (1653453)
by jpokorny＠fedorahosted.org 15 Aug '12

15 Aug '12

Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git On branch : RHEL5-active >--------------------------------------------------------------- commit 165345341ea3d9a9f81ffed664f86880122734d9 Author: Jan Pokorný <jpokorny(a)redhat.com> Date: Wed Aug 15 16:54:50 2012 +0200 ricci: daemon_init: further unify with rgmanager's one Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> >--------------------------------------------------------------- ricci/common/daemon_init.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ricci/common/daemon_init.c b/ricci/common/daemon_init.c index 5737249..c3295c7 100644 --- a/ricci/common/daemon_init.c +++ b/ricci/common/daemon_init.c @@ -1,5 +1,5 @@ /* - Copyright Red Hat, Inc. 2002-2008 + Copyright Red Hat, Inc. 2002-2012 Copyright Mission Critical Linux, 2000 This program is free software; you can redistribute it and/or modify it @@ -20,8 +20,6 @@ /** @file * daemon_init function, does sanity checks and calls daemon(). * - * $Id: daemon_init.c,v 1.1.2.2 2008/05/12 15:13:32 rmccabe Exp $ - * * Author: Jeff Moyer <moyer(a)mclinux.com> */ /* @@ -74,7 +72,6 @@ check_pid_valid(pid_t pid, char *prog) snprintf(dirpath, sizeof (dirpath), "/proc/%d", pid); if ((dir = opendir(dirpath)) == NULL) { - closedir(dir); return 0; /* Pid has gone away. */ } closedir(dir); @@ -150,8 +147,11 @@ check_process_running(char *prog, pid_t * pid) if (fp == NULL) { /* error */ return 0; } - fscanf(fp, "%d\n", &oldpid); + ret = fscanf(fp, "%d\n", &oldpid); fclose(fp); + if ((ret == EOF) || (ret != 1)) + return 0; + if (check_pid_valid(oldpid, cmd)) { *pid = oldpid; return 1; @@ -228,8 +228,14 @@ daemon_init(char *prog) exit(1); } - daemon(0, 0); + if (daemon(0, 0)) { + fprintf(stderr, "daemon_init: Unable to daemonize.\n"); + exit(1); + } update_pidfile(prog); - nice(-1); + if (nice(-1) < 0) + fprintf(stderr, "daemon_init: Unable to renice.\n"); + + //mlockall(MCL_CURRENT | MCL_FUTURE); }

1 0

[conga-luci-1stgen] RHEL5-active: luci: sync Data.fs (1ed63b4)
by rmccabe＠fedorahosted.org 14 Aug '12

14 Aug '12

1 0

[conga-luci-1stgen] RHEL5-active: luci: Usability improvements for nfsrestart (69af4c6)
by rmccabe＠fedorahosted.org 14 Aug '12

14 Aug '12

Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git On branch : RHEL5-active >--------------------------------------------------------------- commit 69af4c6c1fe88c36bd5b78f32c4f7edacae4acd9 Author: Ryan McCabe <rmccabe(a)redhat.com> Date: Tue Aug 14 17:17:35 2012 -0400 luci: Usability improvements for nfsrestart Don't allow nfsrestart to be set unless force_unmount has also been set. Disable the checkbox for nfsrestart if force_unmount's checkbox is unchecked. Resolves: rhbz#822633 Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com> >--------------------------------------------------------------- luci/cluster/resource-form-macros | 21 +++++++++------------ luci/cluster/resource_form_handlers.js | 14 ++++++++++++++ luci/site/luci/Extensions/ResourceHandler.py | 8 ++++++++ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/luci/cluster/resource-form-macros b/luci/cluster/resource-form-macros index 6c2a7cb..d00224f 100644 --- a/luci/cluster/resource-form-macros +++ b/luci/cluster/resource-form-macros @@ -459,7 +459,8 @@ <form method="post" tal:attributes="name res/parent_uuid | nothing" - tal:define="editDisabled resourceIsRef | nothing"> + tal:define="editDisabled resourceIsRef | nothing; + force_unmount res/attrs/force_unmount | nothing"> <input name="immutable" type="hidden" value="true" tal:condition="editDisabled" /> @@ -568,14 +569,11 @@ <tr class="systemsTable"> <td class="systemsTable">Force unmount</td> <td class="systemsTable"> - <tal:block tal:define=" - force_unmount res/attrs/force_unmount | nothing"> - <input type="checkbox" name="forceunmount" + onchange="forceunmount_update(this.form)" tal:attributes=" disabled python: editDisabled; checked python:(force_unmount and force_unmount.lower() == 'true' or force_unmount == '1') and 'checked' or ''" /> - </tal:block> </td> </tr> @@ -612,7 +610,7 @@ tal:define="nfsrestart res/attrs/nfsrestart | nothing"> <input type="checkbox" name="nfsrestart" tal:attributes=" - disabled python: editDisabled; + disabled python: (editDisabled or not force_unmount or not (force_unmount.lower() == 'true' or force_unmount == '1')); checked python:(nfsrestart and nfsrestart.lower() == 'true' or nfsrestart == '1') and 'checked' or ''" /> </tal:block> </td> @@ -630,7 +628,8 @@ <form method="post" tal:attributes="name res/parent_uuid | nothing" - tal:define="editDisabled resourceIsRef | nothing"> + tal:define="editDisabled resourceIsRef | nothing; + force_unmount res/attrs/force_unmount | nothing"> <input name="immutable" type="hidden" value="true" tal:condition="editDisabled" /> @@ -729,14 +728,11 @@ <tr class="systemsTable"> <td class="systemsTable">Force unmount</td> <td class="systemsTable"> - <tal:block tal:define=" - force_unmount res/attrs/force_unmount | nothing"> - <input type="checkbox" name="forceunmount" + onchange="forceunmount_update(this.form)" tal:attributes=" disabled python: editDisabled; checked python:(force_unmount and force_unmount.lower() == 'true' or force_unmount == '1') and 'checked' or ''" /> - </tal:block> </td> </tr> @@ -760,7 +756,7 @@ tal:define="nfsrestart res/attrs/nfsrestart | nothing"> <input type="checkbox" name="nfsrestart" tal:attributes=" - disabled python: editDisabled; + disabled python: (editDisabled or not force_unmount or not (force_unmount.lower() == 'true' or force_unmount == '1')); checked python:(nfsrestart and nfsrestart.lower() == 'true' or nfsrestart == '1') and 'checked' or ''" /> </tal:block> </td> @@ -884,6 +880,7 @@ force_unmount res/attrs/force_unmount | nothing"> <input type="checkbox" name="forceunmount" + onchange="forceunmount_update(this.form)" tal:attributes=" disabled python: editDisabled; checked python:(force_unmount and force_unmount.lower() == 'true' or force_unmount == '1') and 'checked' or ''" /> diff --git a/luci/cluster/resource_form_handlers.js b/luci/cluster/resource_form_handlers.js index db9a33d..caefed1 100644 --- a/luci/cluster/resource_form_handlers.js +++ b/luci/cluster/resource_form_handlers.js @@ -484,6 +484,20 @@ function set_recovery_type(form) { } } +function forceunmount_update(form) { + var nfsrestart_cb = form.nfsrestart; + if (!nfsrestart_cb) { + return; + } + + if (form.forceunmount.checked) { + nfsrestart_cb.disabled = false; + } else { + nfsrestart_cb.checked = false; + nfsrestart_cb.disabled = true; + } +} + function forms_to_xml(submit_button, master_form) { var errors = new Array(); var form_xml = ''; diff --git a/luci/site/luci/Extensions/ResourceHandler.py b/luci/site/luci/Extensions/ResourceHandler.py index ed55580..22f15f5 100644 --- a/luci/site/luci/Extensions/ResourceHandler.py +++ b/luci/site/luci/Extensions/ResourceHandler.py @@ -178,7 +178,9 @@ def addFs(res, rname, form, model): fsid = str(generate_fsid(model, rname)) res.addAttribute('fsid', fsid) + has_forceunmount = False if form.has_key('forceunmount'): + has_forceunmount = True res.addAttribute('force_unmount', '1') else: res.addAttribute('force_unmount', '0') @@ -194,6 +196,8 @@ def addFs(res, rname, form, model): res.addAttribute('force_fsck', '0') if form.has_key('nfsrestart'): + if not has_forceunmount: + raise Exception, 'nfsrestart requires force_unmount' res.addAttribute('nfsrestart', '1') else: res.removeAttribute('nfsrestart') @@ -265,7 +269,9 @@ def addClusterfs(res, rname, form, model): fsid = str(generate_fsid(model, rname)) res.addAttribute('fsid', fsid) + has_forceunmount = False if form.has_key('forceunmount'): + has_forceunmount = True res.addAttribute('force_unmount', '1') else: res.addAttribute('force_unmount', '0') @@ -276,6 +282,8 @@ def addClusterfs(res, rname, form, model): res.addAttribute('self_fence', '0') if form.has_key('nfsrestart'): + if not has_forceunmount: + raise Exception, 'nfsrestart requires force_unmount' res.addAttribute('nfsrestart', '1') else: res.removeAttribute('nfsrestart')

1 0

[conga-luci-1stgen] RHEL5-active: luci: Fixes for fence_ilo_mp (f5263e9)
by rmccabe＠fedorahosted.org 14 Aug '12

14 Aug '12

1 0

[conga-luci-1stgen] RHEL5-active: cluster-snmp: REDHAT-CLUSTER-MIB: typo+trailing whitespace (b87fd73)
by jpokorny＠fedorahosted.org 14 Aug '12

14 Aug '12

Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git On branch : RHEL5-active >--------------------------------------------------------------- commit b87fd730b324b8129d29170fcc4246847af48ffa Author: Jan Pokorný <jpokorny(a)redhat.com> Date: Tue Aug 14 17:10:25 2012 +0200 cluster-snmp: REDHAT-CLUSTER-MIB: typo+trailing whitespace Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> >--------------------------------------------------------------- ricci/modules/cluster/clumon/REDHAT-CLUSTER-MIB | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ricci/modules/cluster/clumon/REDHAT-CLUSTER-MIB b/ricci/modules/cluster/clumon/REDHAT-CLUSTER-MIB index f2252ef..231c732 100644 --- a/ricci/modules/cluster/clumon/REDHAT-CLUSTER-MIB +++ b/ricci/modules/cluster/clumon/REDHAT-CLUSTER-MIB @@ -353,7 +353,7 @@ rhcServiceStatusDesc OBJECT-TYPE MAX-ACCESS read-only STATUS current DESCRIPTION - "Dervice status description" + "Service status description" ::= { rhcServiceEntry 3 } rhcServiceStartMode OBJECT-TYPE

1 0

[conga-luci-1stgen] RHEL5-active: cluster-snmp: README: slightly reformat, 64bit env. info (197c989)
by jpokorny＠fedorahosted.org 13 Aug '12

13 Aug '12

Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git On branch : RHEL5-active >--------------------------------------------------------------- commit 197c989cc824b4515c8cd267b58d2c53ae13c785 Author: Jan Pokorný <jpokorny(a)redhat.com> Date: Mon Aug 13 15:16:35 2012 +0200 cluster-snmp: README: slightly reformat, 64bit env. info Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> >--------------------------------------------------------------- ricci/modules/cluster/clumon/README.snmpd | 30 ++++++++++++++++++---------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ricci/modules/cluster/clumon/README.snmpd b/ricci/modules/cluster/clumon/README.snmpd index 8239e52..3124d7a 100644 --- a/ricci/modules/cluster/clumon/README.snmpd +++ b/ricci/modules/cluster/clumon/README.snmpd @@ -1,14 +1,21 @@ +net-snmp configuration +====================== -net-snmp configuration: +Refer to net-snmp documentation for ACL configuration (/etc/snmp/snmpd.conf is +commented as well). To load cluster MIB's shared library, add following line +to /etc/snmpd/snmp.conf: -Refer to net-snmp documentation for ACL configuration (/etc/snmp/snmpd.conf is commented as well). -To load cluster MIB's shared library, add following line to /etc/snmpd/snmp.conf dlmod RedHatCluster /usr/lib/cluster-snmp/libClusterMonitorSnmp.so +Warning: +The exact location may vary; e.g., in the 64bit environment, it may be +/usr/lib64/cluster-snmp/libClusterMonitorSnmp.so (as silently expected). + Sample configurations: -1. cluster info is accessible from anywhere using "public" community (add the following to default /etc/snmp/snmpd.conf): +1. cluster info is accessible from anywhere using "public" community (add the + following to default /etc/snmp/snmpd.conf): ###################################### ## cluster monitoring configuration ## @@ -22,8 +29,8 @@ view systemview included REDHAT-CLUSTER-MIB:RedHatCluster ###################################### - -2. cluster info is accessible from localhost and 192.168.0.0/16 using "cluster" community: +2. cluster info is accessible from localhost and 192.168.0.0/16 using "cluster" + community: ###################################### ## cluster monitoring configuration ## @@ -52,11 +59,12 @@ access clusterGroup "" any noauth prefix clusterview none none ###################################### +net-snmp client configuration +============================= -net-snmp client configuration: -Place REDHAT-MIB and REDHAT-CLUSTER-MIB into ~/.snmp/mibs/, and query cluster using: -snmpwalk -v 2c -c COMMUNITY NODENAME REDHAT-CLUSTER-MIB::RedHatCluster -(replace NODENAME with the hostname of one of cluster nodes running software) - +Place REDHAT-MIB and REDHAT-CLUSTER-MIB into ~/.snmp/mibs/, and query cluster +using: +snmpwalk -v 2c -c COMMUNITY NODENAME REDHAT-CLUSTER-MIB::RedHatCluster +(replace NODENAME with the hostname of one of cluster nodes running software)

1 0

[conga-luci-1stgen] RHEL5-active: luci: remove trailing whitespaces (833075f)
by jpokorny＠fedorahosted.org 03 Aug '12

03 Aug '12

Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git On branch : RHEL5-active >--------------------------------------------------------------- commit 833075ff9ff30edb4a0d3bf8038ce940229d83df Author: Jan Pokorný <jpokorny(a)redhat.com> Date: Fri Aug 3 17:31:13 2012 +0200 luci: remove trailing whitespaces Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> >--------------------------------------------------------------- 0 files changed, 0 insertions(+), 0 deletions(-)

1 0

[conga-luci-1stgen] RHEL5-active: Fix bz835649 (d128202)
by jpokorny＠fedorahosted.org 03 Aug '12

03 Aug '12

Repository : http://git.fedorahosted.org/git/?p=conga-luci-1stgen.git On branch : RHEL5-active >--------------------------------------------------------------- commit d12820252ba90d4084356653326fa80e9cbc1a92 Author: Jan Pokorný <jpokorny(a)redhat.com> Date: Fri Aug 3 17:27:32 2012 +0200 Fix bz835649 aka luci uninstall will leave /var/lib/luci/var/pts and /usr/lib*/luci/zope/var/pts behind (more proper fix so that the /usr/lib*/luci/var will not be left behind + unify using RPM macros for /var/ etc.) Signed-off-by: Jan Pokorný <jpokorny(a)redhat.com> >--------------------------------------------------------------- conga.spec.in.in | 24 ++++++++++++++++-------- make/version.in | 2 +- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/conga.spec.in.in b/conga.spec.in.in index 559a570..f2d1829 100644 --- a/conga.spec.in.in +++ b/conga.spec.in.in @@ -140,8 +140,8 @@ dispatches incoming messages to underlying management modules. This package contains the luci server. %files -n luci -%verify(not size md5 mtime) /var/lib/luci/var/Data.fs -%verify(not size md5 mtime) /var/lib/luci/.default_password_has_been_reset +%verify(not size md5 mtime) %{_localstatedir}/lib/luci/var/Data.fs +%verify(not size md5 mtime) %{_localstatedir}/lib/luci/.default_password_has_been_reset %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/luci %{_sysconfdir}/rc.d/init.d/luci @@ -166,7 +166,7 @@ fi id luci >&/dev/null if [ $? -ne 0 ]; then - /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null + /usr/sbin/useradd -r -M -s /sbin/nologin -d %{_localstatedir}/lib/luci -g luci luci >&/dev/null fi if [ $1 -gt 1 ]; then @@ -192,16 +192,16 @@ LUCI_RUNNING=$? if [ $LUCI_RUNNING -eq 0 ]; then /sbin/service luci stop >&/dev/null fi -if [ -f /var/lib/luci/var/luci_backup.xml ]; then +if [ -f %{_localstatedir}/lib/luci/var/luci_backup.xml ]; then # restore luci database /usr/sbin/luci_admin restore >&/dev/null fi # set initial admin password (if not already set) to random value -grep True /var/lib/luci/.default_password_has_been_reset >&/dev/null +grep True %{_localstatedir}/lib/luci/.default_password_has_been_reset >&/dev/null if [ $? -ne 0 ]; then /usr/sbin/luci_admin password --random >&/dev/null && - rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old >& /dev/null + rm -f %{_localstatedir}/lib/luci/var/{Data.fs.index,Data.fs.tmp,Data.fs.old} >& /dev/null find %{_libdir}/luci/zope/var -print0 2>/dev/null | xargs -0 chown luci: >&/dev/null fi if [ $LUCI_RUNNING -eq 0 ]; then @@ -226,7 +226,9 @@ if [ $1 -eq 0 ]; then # remove message catalog cache of PlacelessTranslationService (PTS) # which is created upon first run of installed luci (rhbz#835649) - rm -rf -- %{_localstatedir}/lib/luci/var/pts %{_libdir}/luci/zope/var/pts + # note: in the latter case, start right from "var" component as it is + # a synthetic dir created by the Zope/Plone not tracked by RPM + rm -rf -- %{_localstatedir}/lib/luci/var/pts %{_libdir}/luci/zope/var fi exit 0 @@ -311,7 +313,7 @@ reboot, rpm, storage, service and log management modules. %pre -n ricci getent group ricci >/dev/null || groupadd -r ricci -getent passwd ricci >/dev/null || useradd -r -M -g ricci -d /var/lib/ricci -s /sbin/nologin -c "ricci daemon user" ricci +getent passwd ricci >/dev/null || useradd -r -M -g ricci -d %{_localstatedir}/lib/ricci -s /sbin/nologin -c "ricci daemon user" ricci exit 0 %post -n ricci @@ -344,6 +346,12 @@ exit 0 ### changelog ### %changelog +* Tue Jul 31 2012 Jan Pokorny <jpokorny(a)redhat.com> 0.12.2-59 +- Fix bz835649 (luci uninstall will leave /var/lib/luci/var/pts and /usr/lib*/luci/zope/var/pts behind) + +* Mon Jul 30 2012 Ryan McCabe <rmccabe(a)redhat.com> 0.12.2-58 +- Fix bz832183 (Luci is missing configuration of ssl for fence_ilo) + * Wed Jul 25 2012 Jan Pokorny <jpokorny(a)redhat.com> 0.12.2-57 - Fix bz835649 (luci uninstall will leave /var/lib/luci/var/pts and /usr/lib*/luci/zope/var/pts behind) diff --git a/make/version.in b/make/version.in index 5b1e22f..22c6d5b 100644 --- a/make/version.in +++ b/make/version.in @@ -1,2 +1,2 @@ VERSION=0.12.2 -RELEASE=57 +RELEASE=59

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

conga-luci-1stgen-commits August 2012