passenger 4.0.0.rc4 → 4.0.0.rc6

data/ext/apache2/Configuration.hpp

@@ -337,6 +337,9 @@ struct DirConfig {
 struct ServerConfig {
 	/** The Passenger root folder. */
 	const char *root;
+
+	/** The default Ruby interpreter to use. */
+	const char *defaultRuby;
 	
 	/** The log verbosity. */
 	int logLevel;
@@ -380,6 +383,7 @@ struct ServerConfig {
 	
 	ServerConfig() {
 		root               = NULL;
+		defaultRuby        = DEFAULT_RUBY;
 		logLevel           = DEFAULT_LOG_LEVEL;
 		debugLogFile       = NULL;
 		maxPoolSize        = DEFAULT_MAX_POOL_SIZE;

data/ext/apache2/Hooks.cpp

@@ -955,7 +955,7 @@ private:
 		addHeader(output, "PASSENGER_STATUS_LINE", "false");
 		addHeader(output, "PASSENGER_APP_ROOT", appRoot);
 		addHeader(output, "PASSENGER_APP_GROUP_NAME", config->getAppGroupName(appRoot));
-		addHeader(output, "PASSENGER_RUBY", config->ruby);
+		addHeader(output, "PASSENGER_RUBY", config->ruby ? config->ruby : serverConfig.defaultRuby);
 		addHeader(output, "PASSENGER_PYTHON", config->python);
 		addHeader(output, "PASSENGER_ENV", config->getEnvironment());
 		addHeader(output, "PASSENGER_SPAWN_METHOD", config->getSpawnMethodString());
@@ -1265,7 +1265,7 @@ public:
 			serverConfig.userSwitching,
 			serverConfig.defaultUser, serverConfig.defaultGroup,
 			unixd_config.user_id, unixd_config.group_id,
-			serverConfig.root, "ruby", serverConfig.maxPoolSize,
+			serverConfig.root, serverConfig.defaultRuby, serverConfig.maxPoolSize,
 			serverConfig.maxInstancesPerApp, serverConfig.poolIdleTime,
 			"",
 			serverConfig.analyticsLogUser,

data/ext/common/AgentsStarter.cpp

@@ -52,7 +52,7 @@ agents_starter_start(AgentsStarter *as,
                      const char *defaultUser, const char *defaultGroup,
                      uid_t webServerWorkerUid, gid_t webServerWorkerGid,
                      const char *passengerRoot,
-                     const char *rubyCommand, unsigned int maxPoolSize,
+                     const char *defaultRubyCommand, unsigned int maxPoolSize,
                      unsigned int maxInstancesPerApp,
                      unsigned int poolIdleTime,
                      const char *analyticsServer,
@@ -84,7 +84,7 @@ agents_starter_start(AgentsStarter *as,
 			webServerPid, tempDir, userSwitching,
 			defaultUser, defaultGroup,
 			webServerWorkerUid, webServerWorkerGid,
-			passengerRoot, rubyCommand,
+			passengerRoot, defaultRubyCommand,
 			maxPoolSize, maxInstancesPerApp, poolIdleTime,
 			analyticsServer,
 			analyticsLogUser, analyticsLogGroup,

data/ext/common/AgentsStarter.h

@@ -52,7 +52,7 @@ int  agents_starter_start(AgentsStarter *as,
                           const char *defaultUser, const char *defaultGroup,
                           uid_t webServerWorkerUid, gid_t webServerWorkerGid,
                           const char *passengerRoot,
-                          const char *rubyCommand, unsigned int maxPoolSize,
+                          const char *defaultRubyCommand, unsigned int maxPoolSize,
                           unsigned int maxInstancesPerApp,
                           unsigned int poolIdleTime,
                           const char *analyticsServer,

data/ext/common/AgentsStarter.hpp

@@ -375,7 +375,7 @@ public:
 	           pid_t webServerPid, const string &tempDir,
 	           bool userSwitching, const string &defaultUser, const string &defaultGroup,
 	           uid_t webServerWorkerUid, gid_t webServerWorkerGid,
-	           const string &passengerRoot, const string &rubyCommand,
+	           const string &passengerRoot, const string &defaultRubyCommand,
 	           unsigned int maxPoolSize, unsigned int maxInstancesPerApp,
 	           unsigned int poolIdleTime,
 	           const string &analyticsServer,
@@ -414,7 +414,7 @@ public:
 			.setUid ("web_server_worker_uid", webServerWorkerUid)
 			.setGid ("web_server_worker_gid", webServerWorkerGid)
 			.set    ("passenger_root",  passengerRoot)
-			.set    ("ruby",            rubyCommand)
+			.set    ("default_ruby",    defaultRubyCommand)
 			.setInt ("max_pool_size",   maxPoolSize)
 			.setInt ("max_instances_per_app",     maxInstancesPerApp)
 			.setInt ("pool_idle_time",            poolIdleTime)

data/ext/common/ApplicationPool2/DirectSpawner.h

@@ -111,7 +111,6 @@ private:
 	
 	vector<string> createCommand(const Options &options, shared_array<const char *> &args) const {
 		vector<string> startCommandArgs;
-		string processTitle;
 		string agentsDir = resourceLocator.getAgentsDir();
 		vector<string> command;
 		
@@ -119,12 +118,7 @@ private:
 		if (startCommandArgs.empty()) {
 			throw RuntimeException("No startCommand given");
 		}
-		if (options.getProcessTitle().empty()) {
-			processTitle = startCommandArgs[0];
-		} else {
-			processTitle = options.getProcessTitle() + ": " + options.appRoot;
-		}
-		
+
 		if (options.loadShellEnvvars) {
 			command.push_back("bash");
 			command.push_back("bash");
@@ -137,7 +131,9 @@ private:
 		command.push_back(agentsDir + "/SpawnPreparer");
 		command.push_back(serializeEnvvarsFromPoolOptions(options));
 		command.push_back(startCommandArgs[0]);
-		command.push_back(processTitle);
+		// Note: do not try to set a process title here.
+		// https://code.google.com/p/phusion-passenger/issues/detail?id=855
+		command.push_back(startCommandArgs[0]);
 		for (unsigned int i = 1; i < startCommandArgs.size(); i++) {
 			command.push_back(startCommandArgs[i]);
 		}

data/ext/common/ApplicationPool2/Group.h

@@ -181,6 +181,7 @@ private:
 		vector<Callback> postLockActions);
 	void startCheckingDetachedProcesses(bool immediately);
 	void detachedProcessesCheckerMain(GroupPtr self);
+	void wakeUpGarbageCollector();
 	bool poolAtFullCapacity() const;
 	bool anotherGroupIsWaitingForCapacity() const;
 
@@ -197,8 +198,8 @@ private:
 		assert((lifeStatus == ALIVE) == (spawner != NULL));
 
 		// Verify getWaitlist invariants.
-		assert(!( !getWaitlist.empty() ) || ( enabledProcesses.empty() || pqueue.top()->atFullCapacity() ));
-		assert(!( !enabledProcesses.empty() && !pqueue.top()->atFullCapacity() ) || ( getWaitlist.empty() ));
+		assert(!( !getWaitlist.empty() ) || ( enabledProcesses.empty() || pqueue.top()->atFullUtilization() ));
+		assert(!( !enabledProcesses.empty() && !pqueue.top()->atFullUtilization() ) || ( getWaitlist.empty() ));
 		assert(!( enabledProcesses.empty() && !spawning() && !restarting() && !poolAtFullCapacity() ) || ( getWaitlist.empty() ));
 		assert(!( !getWaitlist.empty() ) || ( !enabledProcesses.empty() || spawning() || restarting() || poolAtFullCapacity() ));
 		
@@ -378,7 +379,7 @@ private:
 		// Checkout sessions from enabled processes, or if there are none,
 		// from disabling processes.
 		if (enabledCount > 0) {
-			while (!getWaitlist.empty() && pqueue.top() != NULL && !pqueue.top()->atFullCapacity()) {
+			while (!getWaitlist.empty() && pqueue.top() != NULL && !pqueue.top()->atFullUtilization()) {
 				GetAction action;
 				action.callback = getWaitlist.front().callback;
 				action.session  = newSession();
@@ -413,7 +414,7 @@ private:
 	
 	void assignSessionsToGetWaiters(vector<Callback> &postLockActions) {
 		if (enabledCount > 0) {
-			while (!getWaitlist.empty() && pqueue.top() != NULL && !pqueue.top()->atFullCapacity()) {
+			while (!getWaitlist.empty() && pqueue.top() != NULL && !pqueue.top()->atFullUtilization()) {
 				postLockActions.push_back(boost::bind(
 					getWaitlist.front().callback, newSession(),
 					ExceptionPtr()));
@@ -438,6 +439,7 @@ private:
 	}
 
 	void enableAllDisablingProcesses(vector<Callback> &postLockActions) {
+		P_DEBUG("Enabling all DISABLING processes with result DR_ERROR");
 		deque<DisableWaiter>::iterator it, end = disableWaitlist.end();
 		for (it = disableWaitlist.begin(); it != end; it++) {
 			const DisableWaiter &waiter = *it;
@@ -448,6 +450,7 @@ private:
 			if (process->enabled == Process::DISABLING) {
 				removeProcessFromList(process, disablingProcesses);
 				addProcessToList(process, enabledProcesses);
+				P_DEBUG("Enabled process " << process->inspect());
 			}
 		}
 		clearDisableWaitlist(DR_ERROR, postLockActions);
@@ -571,8 +574,8 @@ public:
 	 *    if !spawning():
 	 *       (enabledCount > 0) or (disablingCount == 0)
 	 *
-	 *    if pqueue.top().atFullCapacity():
-	 *       All enabled processes are at full capacity.
+	 *    if pqueue.top().atFullUtilization():
+	 *       All enabled processes are at full utilization.
 	 *
 	 *    for all process in enabledProcesses:
 	 *       process.enabled == Process::ENABLED
@@ -735,8 +738,8 @@ public:
 		} else {
 			Process *process = pqueue.top();
 			assert(process != NULL);
-			if (process->atFullCapacity()) {
-				/* Looks like all processes are at full capacity.
+			if (process->atFullUtilization()) {
+				/* Looks like all processes are at full utilization.
 				 * Wait until a new one has been spawned or until
 				 * resources have become free.
 				 */
@@ -827,6 +830,9 @@ public:
 			}
 		}
 		disableWaitlist = newDisableWaitlist;
+
+		// Update GC sleep timer.
+		wakeUpGarbageCollector();
 	}
 
 	/**
@@ -1080,13 +1086,13 @@ public:
 		}
 		switch (lifeStatus) {
 		case ALIVE:
-			stream << "<life_status>alive</life_status>";
+			stream << "<life_status>ALIVE</life_status>";
 			break;
 		case SHUTTING_DOWN:
-			stream << "<life_status>shutting_down</life_status>";
+			stream << "<life_status>SHUTTING_DOWN</life_status>";
 			break;
 		case SHUT_DOWN:
-			stream << "<life_status>shut_down</life_status>";
+			stream << "<life_status>SHUT_DOWN</life_status>";
 			break;
 		default:
 			P_BUG("Unknown 'lifeStatus' state " << (int) lifeStatus);

data/ext/common/ApplicationPool2/Implementation.cpp

@@ -483,8 +483,8 @@ Group::onSessionClose(const ProcessPtr &process, Session *session) {
 			 * become available then call them now.
 			 */
 			UPDATE_TRACE_POINT();
+			// Already calls verifyInvariants().
 			assignSessionsToGetWaitersQuickly(lock);
-			verifyInvariants();
 		}
 	}
 }
@@ -494,9 +494,9 @@ Group::requestOOBW(const ProcessPtr &process) {
 	// Standard resource management boilerplate stuff...
 	PoolPtr pool = getPool();
 	unique_lock<boost::mutex> lock(pool->syncher);
-	assert(isAlive());
-
-	process->oobwRequested = true;
+	if (isAlive() && process->isAlive() && process->oobwStatus == Process::OOBW_NOT_ACTIVE) {
+		process->oobwStatus = Process::OOBW_REQUESTED;
+	}
 }
 
 // The 'self' parameter is for keeping the current Group object alive
@@ -515,18 +515,20 @@ Group::lockAndAsyncOOBWRequestIfNeeded(const ProcessPtr &process, DisableResult
 		return;
 	}
 	
+	P_DEBUG("Process " << process->inspect() << " disabled; proceeding with OOBW");
 	asyncOOBWRequestIfNeeded(process);
 }
 
 void
 Group::asyncOOBWRequestIfNeeded(const ProcessPtr &process) {
-	if (!process->oobwRequested || !process->isAlive()) {
+	if (process->oobwStatus != Process::OOBW_REQUESTED || !process->isAlive()) {
 		return;
 	}
 	if (process->enabled == Process::ENABLED) {
 		// We want the process to be disabled. However, disabling a process is potentially
 		// asynchronous, so we pass a callback which will re-aquire the lock and call this
 		// method again.
+		P_DEBUG("Disabling process " << process->inspect() << " in preparation for OOBW");
 		DisableResult result = disable(process,
 			boost::bind(&Group::lockAndAsyncOOBWRequestIfNeeded, this,
 				_1, _2, shared_from_this()));
@@ -540,6 +542,7 @@ Group::asyncOOBWRequestIfNeeded(const ProcessPtr &process) {
 	assert(process->enabled == Process::DISABLED);
 	assert(process->sessions == 0);
 	
+	P_DEBUG("Initiating OOBW request for process " << process->inspect());
 	interruptableThreads.create_thread(
 		boost::bind(&Group::spawnThreadOOBWRequest, this, shared_from_this(), process),
 		"OOB request thread for process " + process->inspect(),
@@ -555,25 +558,34 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 
 	Socket *socket;
 	Connection connection;
+	PoolPtr pool = getPool();
+	Pool::DebugSupportPtr debug = pool->debugSupport;
+
+	UPDATE_TRACE_POINT();
+	P_DEBUG("Performing OOBW request for process " << process->inspect());
+	if (debug != NULL && debug->oobw) {
+		debug->debugger->send("OOBW request about to start");
+		debug->messages->recv("Proceed with OOBW request");
+	}
 	
+	UPDATE_TRACE_POINT();
 	{
 		// Standard resource management boilerplate stuff...
-		PoolPtr pool = getPool();
 		unique_lock<boost::mutex> lock(pool->syncher);
 		if (OXT_UNLIKELY(!process->isAlive() || !isAlive())) {
 			return;
 		}
 		
-		assert(process->oobwRequested);
+		assert(process->oobwStatus = Process::OOBW_IN_PROGRESS);
 		assert(process->sessions == 0);
 		assert(process->enabled == Process::DISABLED);
 		socket = process->sessionSockets.top();
 		assert(socket != NULL);
 	}
 	
+	UPDATE_TRACE_POINT();
 	unsigned long long timeout = 1000 * 1000 * 60; // 1 min
 	try {
-		ScopeGuard guard(boost::bind(&Socket::checkinConnection, socket, connection));
 		this_thread::restore_interruption ri(di);
 		this_thread::restore_syscall_interruption rsi(dsi);
 
@@ -582,7 +594,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 		// need to completely read the response).
 		connection = socket->checkoutConnection();
 		connection.fail = true;
-		
+		ScopeGuard guard(boost::bind(&Socket::checkinConnection, socket, connection));
 		
 		// This is copied from RequestHandler when it is sending data using the
 		// "session" protocol.
@@ -605,6 +617,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 		gatheredWrite(connection.fd, &data[0], data.size(), &timeout);
 
 		// We do not care what the actual response is ... just wait for it.
+		UPDATE_TRACE_POINT();
 		waitUntilReadable(connection.fd, &timeout);
 	} catch (const SystemException &e) {
 		P_ERROR("*** ERROR: " << e.what() << "\n" << e.backtrace());
@@ -612,6 +625,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 		P_ERROR("*** ERROR: " << e.what() << "\n" << e.backtrace());
 	}
 	
+	UPDATE_TRACE_POINT();
 	vector<Callback> actions;
 	{
 		// Standard resource management boilerplate stuff...
@@ -621,7 +635,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 			return;
 		}
 		
-		process->oobwRequested = false;
+		process->oobwStatus = Process::OOBW_NOT_ACTIVE;
 		if (process->enabled == Process::DISABLED) {
 			enable(process, actions);
 			assignSessionsToGetWaiters(actions);
@@ -629,7 +643,15 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 		
 		pool->fullVerifyInvariants();
 	}
+	UPDATE_TRACE_POINT();
 	runAllActions(actions);
+	actions.clear();
+
+	UPDATE_TRACE_POINT();
+	P_DEBUG("Finished OOBW request for process " << process->inspect());
+	if (debug != NULL && debug->oobw) {
+		debug->debugger->send("OOBW request finished");
+	}
 }
 
 // The 'self' parameter is for keeping the current Group object alive while this thread is running.
@@ -741,7 +763,8 @@ Group::spawnThreadRealMain(const SpawnerPtr &spawner, const Options &options, un
 			// TODO: sure this is the best thing? if there are
 			// processes currently alive we should just use them.
 			P_ERROR("Could not spawn process for group " << name <<
-				": " << exception->what());
+				": " << exception->what() << "\n" <<
+				exception->backtrace());
 			if (enabledCount == 0) {
 				enableAllDisablingProcesses(actions);
 			}
@@ -953,6 +976,11 @@ Group::detachedProcessesCheckerMain(GroupPtr self) {
 	}
 }
 
+void
+Group::wakeUpGarbageCollector() {
+	getPool()->garbageCollectionCond.notify_all();
+}
+
 bool
 Group::poolAtFullCapacity() const {
 	return getPool()->atFullCapacity(false);

data/ext/common/ApplicationPool2/Pool.h

@@ -99,6 +99,7 @@ public:
 		bool restarting;
 		bool spawning;
 		bool superGroup;
+		bool oobw;
 
 		// The following fields may only be accessed by Pool.
 		boost::mutex syncher;
@@ -110,6 +111,7 @@ public:
 			restarting = true;
 			spawning   = true;
 			superGroup = false;
+			oobw       = false;
 			spawnLoopIteration = 0;
 		}
 	};
@@ -432,20 +434,29 @@ public:
 		for (p_it = processes.begin(); p_it != processes.end(); p_it++) {
 			const ProcessPtr &process = *p_it;
 			char buf[128];
+			char membuf[10];
 			
+			snprintf(membuf, sizeof(membuf), "%ldM",
+				(unsigned long) (process->metrics.realMemory() / 1024));
 			snprintf(buf, sizeof(buf),
-					"* PID: %-5lu   Sessions: %-2u   Processed: %-5u   Uptime: %s",
+					"  * PID   : %-5lu   Sessions : %-2u   Processed: %-5u   Uptime: %s\n"
+					"    Memory: %-5s   Last used: %s ago",
 					(unsigned long) process->pid,
 					process->sessions,
 					process->processed,
-					process->uptime().c_str());
-			result << "  " << buf << endl;
+					process->uptime().c_str(),
+					membuf,
+					distanceOfTimeInWords(process->lastUsed / 1000000).c_str());
+			result << buf << endl;
 
 			if (process->enabled == Process::DISABLING) {
 				result << "    Disabling..." << endl;
 			} else if (process->enabled == Process::DISABLED) {
 				result << "    DISABLED" << endl;
 			}
+			if (process->getLifeStatus() == Process::SHUTTING_DOWN) {
+				result << "    Shutting down...";
+			}
 
 			const Socket *socket;
 			if (options.verbose && (socket = process->sockets->findSocketWithName("http")) != NULL) {
@@ -609,7 +620,11 @@ public:
 		// Schedule next garbage collection run.
 		unsigned long long sleepTime;
 		if (nextGcRunTime == 0 || nextGcRunTime <= now) {
-			sleepTime = maxIdleTime;
+			if (maxIdleTime == 0) {
+				sleepTime = 10 * 60 * 1000000;
+			} else {
+				sleepTime = maxIdleTime;
+			}
 		} else {
 			sleepTime = nextGcRunTime - now;
 		}
@@ -747,6 +762,7 @@ public:
 						xml << "Group: <group>";
 						group->inspectXml(xml, false);
 						xml << "</group>";
+						logEntries.push_back(entry);
 					}
 				}
 			}
@@ -792,6 +808,7 @@ public:
 			options);
 		superGroup->initialize();
 		superGroups.set(options.getAppGroupName(), superGroup);
+		garbageCollectionCond.notify_all();
 		return superGroup;
 	}
 	
@@ -977,6 +994,7 @@ public:
 				superGroup = make_shared<SuperGroup>(shared_from_this(), options);
 				superGroup->initialize();
 				superGroups.set(options.getAppGroupName(), superGroup);
+				garbageCollectionCond.notify_all();
 				SessionPtr session = superGroup->get(options, callback);
 				/* The SuperGroup is still initializing so the callback
 				 * should now have been put on the wait list,
@@ -1373,6 +1391,7 @@ public:
 				inspectProcessList(options, result, group->enabledProcesses);
 				inspectProcessList(options, result, group->disablingProcesses);
 				inspectProcessList(options, result, group->disabledProcesses);
+				inspectProcessList(options, result, group->detachedProcesses);
 				result << endl;
 			}
 		}