diff options
author | Justin Bronder <jsbronder@gentoo.org> | 2009-02-21 20:24:19 +0000 |
---|---|---|
committer | Justin Bronder <jsbronder@gentoo.org> | 2009-02-21 20:24:19 +0000 |
commit | 923a7bcc5c8288a5669e168348f4c927cbb35ba2 (patch) | |
tree | bb2431aada652e51e4eb8d214f725b2a7ad21aca /sys-cluster/ganglia/files | |
parent | Version bump, fixes bug 251660 (diff) | |
download | gentoo-2-923a7bcc5c8288a5669e168348f4c927cbb35ba2.tar.gz gentoo-2-923a7bcc5c8288a5669e168348f4c927cbb35ba2.tar.bz2 gentoo-2-923a7bcc5c8288a5669e168348f4c927cbb35ba2.zip |
Clean up old ebuilds/files.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster/ganglia/files')
-rw-r--r-- | sys-cluster/ganglia/files/ganglia-3.1-gmond-python-tcpconn-concurrency.patch | 41 | ||||
-rw-r--r-- | sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch | 17 |
2 files changed, 0 insertions, 58 deletions
diff --git a/sys-cluster/ganglia/files/ganglia-3.1-gmond-python-tcpconn-concurrency.patch b/sys-cluster/ganglia/files/ganglia-3.1-gmond-python-tcpconn-concurrency.patch deleted file mode 100644 index 2b1832b36128..000000000000 --- a/sys-cluster/ganglia/files/ganglia-3.1-gmond-python-tcpconn-concurrency.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: gmond/python_modules/network/tcpconn.py -=================================================================== ---- gmond/python_modules/network/tcpconn.py (revision 1622) -+++ gmond/python_modules/network/tcpconn.py (working copy) -@@ -245,19 +245,14 @@ - tempconns[conn] = 0 - - #Call the netstat utility and split the output into separate lines -- fd_poll = select.poll() -- self.popenChild = popen2.Popen3("netstat -t -a") -- fd_poll.register(self.popenChild.fromchild) -+ self.popenChild = popen2.Popen3("netstat -t -a -n") -+ lines = self.popenChild.fromchild.readlines() - -- poll_events = fd_poll.poll() -- -- if (len(poll_events) == 0): # Timeout -- continue -- -- for (fd, events) in poll_events: -- lines = self.popenChild.fromchild.readlines() -- -- self.popenChild.wait() -+ try: -+ self.popenChild.wait() -+ except OSError, e: -+ if e.errno == 10: # No child process -+ continue - - #Iterate through the netstat output looking for the 'tcp' keyword in the tcp_at - # position and the state information in the tcp_state_at position. Count each -@@ -300,7 +295,8 @@ - _glock.release() - - #Wait for the refresh_rate period before collecting the netstat data again. -- time.sleep(_refresh_rate) -+ if not self.shuttingdown: -+ time.sleep(_refresh_rate) - - #Set the current state of the thread after a shutdown has been indicated. - self.running = False diff --git a/sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch b/sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch deleted file mode 100644 index 1f367e6c7368..000000000000 --- a/sys-cluster/ganglia/files/ganglia-3.1.0-gmetad-hierarchical.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: gmetad/process_xml.c -=================================================================== ---- gmetad/process_xml.c (revision 1634) -+++ gmetad/process_xml.c (working copy) -@@ -724,7 +724,11 @@ - - if (!xmldata->host_alive) - return 0; -- -+ -+ /* Only keep extra element details if we are the authority on this cluster. */ -+ if (!authority_mode(xmldata)) -+ return 0; -+ - hashkey.data = (void*) name; - hashkey.size = strlen(name) + 1; - |