backend/rhn-conf/rhn.conf | 2 --
backend/server/rhn.conf.sample | 2 --
java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf | 1 +
rel-eng/packages/spacewalk-web | 2 +-
web/conf/rhn_web.conf | 4 ++++
web/spacewalk-web.spec | 5 ++++-
6 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 6444d572117d36b3ec8c3d36362b335e59512e87
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Sep 5 11:07:59 2012 -0400
Automatic commit of package [spacewalk-web] release [1.8.34-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 7944e4e..192483b 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.33-1 web/
+1.8.34-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 159ecc2..23fca41 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.33
+Version: 1.8.34
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk/
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Sep 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.34-1
+- 815964 - moving monitoring probe batch option from rhn.conf to rhn_web.conf
+
* Fri Aug 31 2012 Jan Pazdziora 1.8.33-1
- 852048 - fix typo in db-control man page
commit b7b676e05053795e7c8202bd7484a51cc49781c6
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Sep 5 11:07:07 2012 -0400
815964 - moving monitoring probe batch option from rhn.conf to rhn_web.conf
diff --git a/backend/rhn-conf/rhn.conf b/backend/rhn-conf/rhn.conf
index 969486c..a257157 100644
--- a/backend/rhn-conf/rhn.conf
+++ b/backend/rhn-conf/rhn.conf
@@ -13,5 +13,3 @@ log_file = /var/log/rhn/rhn.log
enable_snapshots = 1
-web.monitoring_probes_batch_size = 50
-
diff --git a/backend/server/rhn.conf.sample b/backend/server/rhn.conf.sample
index 4fd075e..eb30b65 100644
--- a/backend/server/rhn.conf.sample
+++ b/backend/server/rhn.conf.sample
@@ -81,8 +81,6 @@ web.mail_server_errors = user0(a)redhat.com, user1(a)redhat.com
web.rhnproc_server = #FIXME
web.rhnproc_port = #FIXME
-#web.monitoring_probes_batch_size = 50
-
### COMPONENT DEFINITIONS ###
diff --git a/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
b/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
index 9f58b5c..2d1a57c 100644
--- a/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
+++ b/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
@@ -9,3 +9,4 @@ web.property_with_comment = 42 #This shouldn't be part of the value
web.product_name=Spacewalk
web.taskomatic_cobbler_user = taskomatic_user
+web.monitoring_probes_batch_size = 50
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 0be7ee9..3a3dcbd 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -243,6 +243,10 @@ web.is_monitoring_backend = 0
# should this system run the monitoring scout code?
web.is_monitoring_scout = 0
+# how many monitoring probes to update at once. Large batches (eg. thousands)
+# can lead to database deadlocks.
+web.monitoring_probes_batch_size = 50
+
# server configs needed for satellite installer
server.satellite.rhn_parent =
server.satellite.http_proxy =