Remove bwmon from pl_mom. Cleanup crons to reflect new NM. Bump major ver to 2.0

diff --git a/pl_mom.cron b/pl_mom.cron
index aea7d20..459c236 100644 (file)
--- a/pl_mom.cron
+++ b/pl_mom.cron
@@ -4,9 +4,9 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id: pl_mom.cron,v 1.2 2006/08/17 20:06:26 faiyaza Exp $
+# $Id$
 #
 
 @M@    @H@     * *     *       root    /usr/local/planetlab/bin/pl_mop.sh
-*/15 *  * * *  root    /usr/share/pl_mom/bwmon.py
-*    12 * * *  root    /usr/share/pl_mom/nm_mom.py
+#*/15 *  * * * root    /usr/share/pl_mom/bwmon.py
+#*    12 * * * root    /usr/share/pl_mom/nm_mom.py

diff --git a/pl_mom.spec b/pl_mom.spec
index de9fd7e..fb0847a 100644 (file)
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,6 +1,6 @@
 %define name pl_mom
-%define version 0.8
-%define release 11%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 2.0
+%define release 01%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
 Summary: PlanetLab node monitoring tools
 Name: %{name}
@@ -28,9 +28,6 @@ process memory usage. At 90% utilization, resets the slice that is
 consuming the most physical memory. At 95% utilization, it reboots the
 machine to avoid a crash.
 
-bwmon is a cron job that monitors the average bandwidth usage of each
-slice and enforces a daily byte limit for each slice.
-
 pl_mop is a cron job that "fixes" various common problems with nodes
 (dead services, ext3 corruption, zombie SSH sessions, etc.).
 
@@ -46,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 install -D -m 644 pl_mom.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/pl_mom.py
 
 # Bandwidth monitor (bwmon), run periodically
-install -D -m 755 bwmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/bwmon.py
+#install -D -m 755 bwmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/bwmon.py
 
 # Swap monitoring daemon (swapmon)
 install -D -m 755 swapmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/swapmon.py
@@ -56,7 +53,7 @@ install -D -m 755 swapmon.init $RPM_BUILD_ROOT/%{_initrddir}/swapmon
 install -D -m 755 pl_mop.sh $RPM_BUILD_ROOT/usr/local/planetlab/bin/pl_mop.sh
 
 # Tests and restarts NM
-install -D -m 755 nm_mom.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/nm_mom.py
+#install -D -m 755 nm_mom.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/nm_mom.py
 
 # Runs pl_mop and bwmon periodically
 install -D -m 644 pl_mom.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/pl_mom
@@ -100,8 +97,8 @@ exit 0
 %files
 %defattr(-, root, root, -)
 %{_datadir}/%{name}/pl_mom.py*
-%{_datadir}/%{name}/nm_mom.py*
-%{_datadir}/%{name}/bwmon.py*
+#%{_datadir}/%{name}/nm_mom.py*
+#%{_datadir}/%{name}/bwmon.py*
 %{_datadir}/%{name}/swapmon.py*
 %{_initrddir}/swapmon
 /usr/local/planetlab/bin/pl_mop.sh

diff --git a/pl_mop.sh b/pl_mop.sh
index 61b7a63..ad5faac 100755 (executable)
--- a/pl_mop.sh
+++ b/pl_mop.sh
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id: pl_mop.sh,v 1.6 2006/04/28 19:28:59 mlhuang Exp $
+# $Id$
 #
 
 PATH=/sbin:/usr/sbin:$PATH
@@ -53,7 +53,7 @@ fix_etc_shadow() {
 
 # keep essential services running
 restart_services() {
-    for service in sshd pl_sshd swapmon pl_nm proper ; do
+    for service in sshd pl_sshd swapmon nm proper ; do
        echo "* Checking $service"
        status=$(service $service status)
        if [ $? -ne 0 ] || echo $status 2>&1 | grep -q stopped ; then