debug: Add debugging to track down buildbot failures.

Signed-off-by: Ben Greear <greearb@candelatech.com>
greearb · Jul 29, 2010 · 3ff9ae7 · 3ff9ae7
1 parent 729d52b
commit 3ff9ae7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/xorp/bgp/bgp.cc b/xorp/bgp/bgp.cc
@@ -160,7 +160,13 @@ BGPMain::~BGPMain()
 #endif
 	) {
 	eventloop().run();
+	if (_peerlist->not_all_idle()) {
+	    // Kick them again
+	    XLOG_WARNING("Stopping all peers in ~BGPMain cleanup loop.\n");
+	    _peerlist->all_stop();
+	}
     }
+
     /*
     ** NOTE: We expect one timer to be pending. The timer is in the xrl_router.
     */

diff --git a/xorp/bgp/harness/peer.cc b/xorp/bgp/harness/peer.cc
@@ -1468,8 +1468,9 @@ Peer::xrl_callback(const XrlError& error, const char *comment)
 void
 Peer::xrl_callback_connected(const XrlError& error, const char *comment)
 {
-    debug_msg("callback_connected %s %s\n", comment, error.str().c_str());
-    if(XrlError::OKAY() == error) {
+    XLOG_INFO("%s: callback_connected, OK: %i %s %s\n",
+	      _peername.c_str(), (int)(error.isOK()), comment, error.str().c_str());
+    if (error.isOK()) {
 	_connected = true;
     } else {
 	_connected = false;

diff --git a/xorp/bgp/peer.cc b/xorp/bgp/peer.cc
@@ -606,7 +606,7 @@ BGPPeer::event_start()			// EVENTBGPSTART
  */
 void
 BGPPeer::event_stop(bool restart, bool automatic)	// EVENTBGPSTOP
-{ 
+{
     TIMESPENT();
 
     switch(_state) {
@@ -2046,7 +2046,7 @@ BGPPeer::set_state(FSMState s, bool restart, bool automatic)
 {
     TIMESPENT();
 
-    debug_msg("Peer %s: Previous state: %s Current state: %s\n",
+    XLOG_INFO("Peer %s: Previous state: %s Current state: %s\n",
 	      peerdata()->iptuple().str().c_str(),
 	      pretty_print_state(_state),
 	      pretty_print_state(s));

diff --git a/xorp/cleanup_xorp.bash b/xorp/cleanup_xorp.bash
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+#  Try to initialize the system before we start doing xorp tests.
+
+# Kill all existing xorp processes
+killall -9 -r xorp
+
+# Remove tmp files
+rm -fr /var/tmp/xrl.* || exit 1
+
+exit 0