@@ -2187,11 +2187,11 @@
 	 (effective-load    (common:get-intercept first next))
 	 (recommended-delay (common:get-delay effective-load numcpus))
 	 (effective-host    (or remote-host "localhost"))
 	 (normalized-effective-load (/ effective-load numcpus))
 	 (will-wait                 (> normalized-effective-load maxnormload)))
-    (if (> recommended-delay 0)
+    (if (> recommended-delay 1) 
 	(let* ((actual-delay (min recommended-delay 30)))
 	  (if (common:low-noise-print 30 (conc (round actual-delay) "-safe-load"))
 	      (debug:print-info 0 *default-log-port* "Load control, delaying "
 				actual-delay " seconds to maintain safe load. current normalized effective load is "
 				normalized-effective-load". maxnormload = " maxnormload " numcpus = " numcpus " loadavg = " loadavg " effective-load = " effective-load))
@@ -2198,19 +2198,21 @@
 	  (thread-sleep! actual-delay)))
     
     (cond
      ;; bad data, try again to get the data
      ((not will-wait)
-      (if (common:low-noise-print 30 (conc (round normalized-effective-load) "-load-acceptable-" effective-host))
-	  (debug:print 0 *default-log-port* "Effective load on " effective-host " is acceptable at " effective-load " continuing.")))
+      ;; (if (common:low-noise-print 30 (conc (round normalized-effective-load) "-load-acceptable-" effective-host))
+      ;;	  (debug:print 0 *default-log-port* "Effective load on " effective-host " is acceptable at " effective-load " continuing.")))
+
      ((and (< first 0) ;; this indicates the loadavg data is bad - machine may not be reachable
 	   (> num-tries 0))
       (debug:print 0 *default-log-port* "WARNING: received bad data from get-cpu-load "
 		   first ", we'll sleep 10s and try " num-tries " more times.")
       (thread-sleep! 10)
       (common:wait-for-cpuload maxnormload numcpus-in
 			       count: count remote-host: remote-host num-tries: (- num-tries 1)))
+
      ;; need to wait for load to drop
      ((and will-wait ;; (> first adjmaxload)
 	   (> count 0))
       (debug:print-info 0 *default-log-port*
 			"Delaying 15" ;; adjwait