From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga ./clustermon.spec.in.in ricci/modules/cl ...
Date: 2 Nov 2007 05:44:34 -0000 [thread overview]
Message-ID: <20071102054434.27157.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-11-02 05:44:33
Modified files:
. : clustermon.spec.in.in
ricci/modules/cluster/clumon/src/snmp-agent: clusterMIB.cpp
nodesMIB_access.cpp
servicesMIB_access.cpp
Log message:
Fix bz334441 (Can't get cluster-snmp (fully) working)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.25.2.8&r2=1.25.2.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.3&r2=1.3.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_access.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2&r2=1.2.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_access.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2&r2=1.2.4.1
--- conga/clustermon.spec.in.in 2007/10/10 18:10:36 1.25.2.8
+++ conga/clustermon.spec.in.in 2007/11/02 05:44:33 1.25.2.9
@@ -195,6 +195,10 @@
%changelog
+* Mon Oct 22 2007 Ryan McCabe <rmccabe@redhat.com> 0.11.0-3
+- Fix bz334441 (Can't get cluster-snmp (fully) working)
+- Resolves: bz334441
+
* Thu Oct 10 2007 Ryan McCabe <rmccabe@redhat.com> 0.11.0-2
- Fix bz326571: Conga displays quorum status incorrectly when qdisk is used
- Resolves: bz326571
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp 2006/08/10 22:53:08 1.3
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp 2007/11/02 05:44:33 1.3.4.1
@@ -33,8 +33,8 @@
using namespace std;
-static unsigned int getStatusCode(Cluster*);
-static String getStatusDescription(unsigned int code);
+static unsigned long getStatusCode(Cluster*);
+static String getStatusDescription(unsigned long code);
void
@@ -213,10 +213,10 @@
}
-unsigned int
+unsigned long
getStatusCode(Cluster* cluster)
{
- unsigned int code = 1; // OK
+ unsigned long code = 1; // OK
if (cluster->failedServices().size() != 0)
// service failed
@@ -242,7 +242,7 @@
}
String
-getStatusDescription(unsigned int code)
+getStatusDescription(unsigned long code)
{
if (code == 1)
return "All services and nodes functional";
@@ -285,7 +285,7 @@
{
try {
- unsigned int num = 1; // MIB version 1
+ unsigned long num = 1; // MIB version 1
/*
* We are never called for a GETNEXT if it's registered as a
@@ -330,7 +330,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int num = cluster->failedServices().size();
+ unsigned long num = cluster->failedServices().size();
/*
* We are never called for a GETNEXT if it's registered as a
@@ -428,7 +428,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int code = getStatusCode(cluster.get());
+ unsigned long code = getStatusCode(cluster.get());
String str = getStatusDescription(code);
/*
@@ -474,7 +474,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int num = cluster->votes();
+ unsigned long num = cluster->votes();
/*
* We are never called for a GETNEXT if it's registered as a
@@ -519,7 +519,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int num = cluster->stoppedServices().size();
+ unsigned long num = cluster->stoppedServices().size();
/*
* We are never called for a GETNEXT if it's registered as a
@@ -617,7 +617,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int num = cluster->clusteredNodes().size();
+ unsigned long num = cluster->clusteredNodes().size();
/*
* We are never called for a GETNEXT if it's registered as a
@@ -715,7 +715,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int num = cluster->services().size();
+ unsigned long num = cluster->services().size();
/*
* We are never called for a GETNEXT if it's registered as a
@@ -858,7 +858,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int code = getStatusCode(cluster.get());
+ unsigned long code = getStatusCode(cluster.get());
/*
* We are never called for a GETNEXT if it's registered as a
@@ -903,7 +903,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int num = cluster->unclusteredNodes().size();
+ unsigned long num = cluster->unclusteredNodes().size();
/*
* We are never called for a GETNEXT if it's registered as a
@@ -1001,7 +1001,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int num = cluster->nodes().size();
+ unsigned long num = cluster->nodes().size();
/*
* We are never called for a GETNEXT if it's registered as a
@@ -1099,7 +1099,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int num = cluster->runningServices().size();
+ unsigned long num = cluster->runningServices().size();
/*
* We are never called for a GETNEXT if it's registered as a
@@ -1198,7 +1198,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int num = cluster->minQuorum();
+ unsigned long num = cluster->minQuorum();
/*
* We are never called for a GETNEXT if it's registered as a
@@ -1244,7 +1244,7 @@
if(cluster.get() == NULL)
return SNMP_ERR_NOERROR;
- unsigned int num = cluster->quorate() ? 1 : 0;
+ unsigned long num = cluster->quorate() ? 1 : 0;
/*
* We are never called for a GETNEXT if it's registered as a
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_access.cpp 2006/08/10 22:53:08 1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_access.cpp 2007/11/02 05:44:33 1.2.4.1
@@ -40,8 +40,8 @@
using namespace std;
-static unsigned int getStatusCode(counting_auto_ptr<Node>);
-static String getStatusDescription(unsigned int code);
+static unsigned long getStatusCode(counting_auto_ptr<Node>);
+static String getStatusDescription(unsigned long code);
class LoopContext
@@ -278,7 +278,7 @@
// ## status ##
-unsigned int
+unsigned long
getStatusCode(counting_auto_ptr<Node> node)
{
if (node->clustered())
@@ -293,7 +293,7 @@
return 2;
}
String
-getStatusDescription(unsigned int code)
+getStatusDescription(unsigned long code)
{
switch(code) {
case 0:
@@ -337,7 +337,7 @@
if (node.get() == NULL)
return NULL;
- unsigned int code = getStatusCode(node);
+ unsigned long code = getStatusCode(node);
datactx->str_holder = getStatusDescription(code);
*ret_len = datactx->str_holder.size();
return (char*) datactx->str_holder.c_str();
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_access.cpp 2006/08/10 22:53:08 1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_access.cpp 2007/11/02 05:44:33 1.2.4.1
@@ -38,8 +38,8 @@
using namespace std;
-static unsigned int getStatusCode(counting_auto_ptr<Service>);
-static String getStatusDescription(unsigned int code);
+static unsigned long getStatusCode(counting_auto_ptr<Service>);
+static String getStatusDescription(unsigned long code);
@@ -274,7 +274,7 @@
// ## status ##
-unsigned int
+unsigned long
getStatusCode(counting_auto_ptr<Service> service)
{
if (service->failed())
@@ -289,7 +289,7 @@
return 1;
}
String
-getStatusDescription(unsigned int code)
+getStatusDescription(unsigned long code)
{
switch(code) {
case 0:
@@ -333,7 +333,7 @@
if (service.get() == NULL)
return NULL;
- unsigned int code = getStatusCode(service);
+ unsigned long code = getStatusCode(service);
datactx->str_holder = getStatusDescription(code);
*ret_len = datactx->str_holder.size();
return (char*) datactx->str_holder.c_str();
next reply other threads:[~2007-11-02 5:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-02 5:44 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-03-31 17:23 [Cluster-devel] conga ./clustermon.spec.in.in ricci/modules/cl rmccabe
2008-03-24 18:13 rmccabe
2007-10-09 19:58 rmccabe
2006-12-13 19:14 kupcevic
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=20071102054434.27157.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.