@@ -244,6 +244,40 @@ private:
return pool;
}
+ /**
+ * Get a session from the application pool, similar to how
+ * ApplicationPool::Interface::get() works. This method also checks whether
+ * the helper server has crashed. If it did then it will wait a while (for
+ * the watchdog to the restart the helper server) and then attempt to reconnect
+ * to the helper server.
+ *
+ * @throws SystemException
+ * @throws IOException
+ * @throws RuntimeException
+ * @throws SecurityExcepion
+ */
+ Application::SessionPtr getSession(const PoolOptions &options) {
+ ApplicationPool::Client *pool = getApplicationPool();
+ try {
+ return pool->get(options);
+ } catch (const SystemException &e) {
+ // Maybe the helper server crashed. First wait 100 ms.
+ /* usleep(100000);
+
+ // Then try to reconnect to the helper server for the next
+ // 5 seconds.
+ time_t begin = time(NULL);
+ while (time(NULL)) */
+
+ //Wait between 500 and 2500 ms,
+ // then reconnect again.
+ int r = rand(); // Don't care about thread-safety of this function.
+ usleep(500000 + r % 2000000);
+ pool = getApplicationPool();
+ return pool->get(options);
+ }
+ }
+
bool hasModRewrite() {
if (m_hasModRewrite == UNKNOWN) {
if (ap_find_linked_module("mod_rewrite.c")) {
@@ -551,7 +585,7 @@ private:
);
options.environmentVariables = ptr(new EnvironmentVariablesStringListCreator(r));
- session = getApplicationPool()->get(options);
+ session = getSession(options);
P_TRACE(3, "Forwarding " << r->uri << " to PID " << session->getPid());
} catch (const SpawnException &e) {
r->status = 500;
ext/apache2/Hooks.cpp
@@ -132,7 +132,7 @@ public:
} catch (const IOException &) {
silentDisconnect();
throw;
- } catch (const boost::thread_interrupt &) {
+ } catch (const boost::thread_interrupted &) {
silentDisconnect();
throw;
}
ext/common/MessageClient.h
@@ -542,11 +542,22 @@ describe "Apache 2 module" do
end
it "is restarted if it crashes" do
- get('/welcome').should =~ /Welcome to MyCook/
+ # Make sure that all Apache worker processes have connected to
+ # the helper server.
+ 10.times do
+ get('/welcome').should =~ /Welcome to MyCook/
+ sleep 0.1
+ end
+
+ # Now kill the helper server.
instance = PhusionPassenger::AdminTools::ServerInstance.list.first
Process.kill('SIGKILL', instance.helper_server_pid)
- retry_with_time_limit(10) do
- get('/welcome') =~ /Welcome to MyCook/
+
+ # Each worker process should detect that the old
+ # helper server has died, and should reconnect.
+ 10.times do
+ get('/welcome').should =~ /Welcome to MyCook/
+ sleep 0.1
end
end
end
test/integration_tests/apache2_tests.rb
@@ -41,9 +41,9 @@ PassengerLogLevel 1
TypesConfig "<%= @server_root %>/mime.types"
StartServers 1
-ServerLimit 50
+ServerLimit 10
MaxRequestsPerChild 50
-MaxClients 50
+MaxClients 10
<IfModule mpm_prefork_module>
MinSpareServers 1
MaxSpareServers 1
test/stub/apache2/httpd.conf.erb
258e4b8bf191b7f5b1ccaf7a326f5f11d9462895
Hongli Lai (Phusion)
hongli@phusion.nl
http://github.com/FooBarWidget/passenger/commit/b77bf782fff5de03cbc470d358a9ed6adba6afd1
b77bf782fff5de03cbc470d358a9ed6adba6afd1
2009-09-17T08:36:00-07:00
2009-09-17T08:36:00-07:00
Automatically reconnect to helper server if it crashed.
923335aea1fdb7c76e122ef32a1aa5a280ba94e2
Hongli Lai (Phusion)
hongli@phusion.nl