passenger 4.0.48 → 4.0.49

data/ext/common/ApplicationPool2/Common.h

@@ -35,6 +35,7 @@
 #include <UnionStation/Transaction.h>
 #include <ApplicationPool2/Options.h>
 #include <Utils/StringMap.h>
+#include <Utils/VariantMap.h>
 
 namespace tut {
 	struct ApplicationPool2_PoolTest;
@@ -119,17 +120,17 @@ enum DisableResult {
 	// The process has been successfully disabled.
 	// Returned by functions and passed to the callback.
 	DR_SUCCESS,
-	
+
 	// The disabling of the process was canceled before completion.
 	// The process still exists.
 	// Only passed to the callback.
 	DR_CANCELED,
-	
+
 	// Nothing happened: the requested process does not exist (anymore)
 	// or was already disabled.
 	// Returned by functions and passed to the callback.
 	DR_NOOP,
-	
+
 	// The disabling of the process failed: an error occurred.
 	// Returned by functions and passed to the callback.
 	DR_ERROR,
@@ -169,7 +170,7 @@ typedef boost::function<void ()> Callback;
 struct GetWaiter {
 	Options options;
 	GetCallback callback;
-	
+
 	GetWaiter(const Options &o, const GetCallback &cb)
 		: options(o),
 		  callback(cb)
@@ -186,8 +187,9 @@ struct Ticket {
 };
 
 struct SpawnerConfig {
-	// Used by error pages.
+	// Used by error pages and hooks.
 	ResourceLocator resourceLocator;
+	const VariantMap *agentsOptions;
 
 	// Used for Union Station logging.
 	UnionStation::CorePtr unionStationCore;
@@ -203,8 +205,10 @@ struct SpawnerConfig {
 
 	SpawnerConfig(const ResourceLocator &_resourceLocator,
 		const UnionStation::CorePtr &_unionStationCore = UnionStation::CorePtr(),
-		const RandomGeneratorPtr &randomGenerator = RandomGeneratorPtr())
+		const RandomGeneratorPtr &randomGenerator = RandomGeneratorPtr(),
+		const VariantMap *_agentsOptions = NULL)
 		: resourceLocator(_resourceLocator),
+		  agentsOptions(_agentsOptions),
 		  unionStationCore(_unionStationCore),
 		  concurrency(1),
 		  spawnerCreationSleepTime(0),

data/ext/common/ApplicationPool2/ComponentInfo.h

@@ -36,10 +36,10 @@ using namespace std;
 struct ComponentInfo {
 	string name;
 	bool   isDefault;
-	
+
 	/****************/
 	/****************/
-	
+
 	ComponentInfo() {
 		isDefault = false;
 		/******************/

data/ext/common/ApplicationPool2/DirectSpawner.h

@@ -46,12 +46,12 @@ private:
 		pthread_t thr;
 		pthread_attr_t attr;
 		size_t stack_size = 96 * 1024;
-		
+
 		unsigned long min_stack_size;
 		bool stack_min_size_defined;
 		bool round_stack_size;
 		int ret;
-		
+
 		#ifdef PTHREAD_STACK_MIN
 			// PTHREAD_STACK_MIN may not be a constant macro so we need
 			// to evaluate it dynamically.
@@ -68,7 +68,7 @@ private:
 		} else {
 			round_stack_size = true;
 		}
-		
+
 		if (round_stack_size) {
 			// Round stack size up to page boundary.
 			long page_size;
@@ -87,7 +87,7 @@ private:
 				stack_size = stack_size - (stack_size % page_size) + page_size;
 			}
 		}
-		
+
 		pthread_attr_init(&attr);
 		pthread_attr_setdetachstate(&attr, 1);
 		pthread_attr_setstacksize(&attr, stack_size);
@@ -95,25 +95,25 @@ private:
 		pthread_attr_destroy(&attr);
 		return ret;
 	}
-	
+
 	static void *detachProcessMain(void *arg) {
 		this_thread::disable_syscall_interruption dsi;
 		pid_t pid = (pid_t) (long) arg;
 		syscalls::waitpid(pid, NULL, 0);
 		return NULL;
 	}
-	
+
 	void detachProcess(pid_t pid) {
 		startBackgroundThread(detachProcessMain, (void *) (long) pid);
 	}
-	
+
 	vector<string> createCommand(const Options &options, const SpawnPreparationInfo &preparation,
 		shared_array<const char *> &args) const
 	{
 		vector<string> startCommandArgs;
 		string agentsDir = config->resourceLocator.getAgentsDir();
 		vector<string> command;
-		
+
 		split(options.getStartCommand(config->resourceLocator), '\t', startCommandArgs);
 		if (startCommandArgs.empty()) {
 			throw RuntimeException("No startCommand given");
@@ -138,11 +138,11 @@ private:
 		for (unsigned int i = 1; i < startCommandArgs.size(); i++) {
 			command.push_back(startCommandArgs[i]);
 		}
-		
+
 		createCommandArgs(command, args);
 		return command;
 	}
-	
+
 public:
 	DirectSpawner(const ServerInstanceDir::GenerationPtr &_generation,
 		const SpawnerConfigPtr &_config)
@@ -150,7 +150,7 @@ public:
 	{
 		generation = _generation;
 	}
-	
+
 	virtual ProcessPtr spawn(const Options &options) {
 		TRACE_POINT();
 		this_thread::disable_interruption di;
@@ -165,7 +165,7 @@ public:
 		Pipe errorPipe = createPipe();
 		DebugDirPtr debugDir = boost::make_shared<DebugDir>(preparation.uid, preparation.gid);
 		pid_t pid;
-		
+
 		pid = syscalls::fork();
 		if (pid == 0) {
 			setenv("PASSENGER_DEBUG_DIR", debugDir->getPath().c_str(), 1);
@@ -183,7 +183,7 @@ public:
 			switchUser(preparation);
 			setWorkingDirectory(preparation);
 			execvp(args[0], (char * const *) args.get());
-			
+
 			int e = errno;
 			printf("!> Error\n");
 			printf("!> \n");
@@ -194,18 +194,18 @@ public:
 			fflush(stdout);
 			fflush(stderr);
 			_exit(1);
-			
+
 		} else if (pid == -1) {
 			int e = errno;
 			throw SystemException("Cannot fork a new process", e);
-			
+
 		} else {
 			UPDATE_TRACE_POINT();
 			ScopeGuard guard(boost::bind(nonInterruptableKillAndWaitpid, pid));
 			P_DEBUG("Process forked for appRoot=" << options.appRoot << ": PID " << pid);
 			adminSocket.first.close();
 			errorPipe.second.close();
-			
+
 			NegotiationDetails details;
 			details.preparation = &preparation;
 			details.stderrCapturer =
@@ -221,7 +221,7 @@ public:
 			details.errorPipe = errorPipe.first;
 			details.options = &options;
 			details.debugDir = debugDir;
-			
+
 			ProcessPtr process;
 			{
 				this_thread::restore_interruption ri(di);

data/ext/common/ApplicationPool2/DummySpawner.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2013 Phusion
+ *  Copyright (c) 2011-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -39,17 +39,17 @@ class DummySpawner: public Spawner {
 private:
 	boost::mutex lock;
 	unsigned int count;
-	
+
 public:
 	unsigned int cleanCount;
-	
+
 	DummySpawner(const SpawnerConfigPtr &_config)
 		: Spawner(_config)
 	{
 		count = 0;
 		cleanCount = 0;
 	}
-	
+
 	virtual ProcessPtr spawn(const Options &options) {
 		TRACE_POINT();
 		possiblyRaiseInternalError(options);
@@ -58,7 +58,7 @@ public:
 		SocketListPtr sockets = boost::make_shared<SocketList>();
 		sockets->add("main", "tcp://127.0.0.1:1234", "session", config->concurrency);
 		syscalls::usleep(config->spawnTime);
-		
+
 		boost::lock_guard<boost::mutex> l(lock);
 		count++;
 		ProcessPtr process = boost::make_shared<Process>(

data/ext/common/ApplicationPool2/Group.h

@@ -67,16 +67,16 @@ class Group: public boost::enable_shared_from_this<Group> {
 public:
 	friend class Pool;
 	friend class SuperGroup;
-	
+
 	struct GetAction {
 		GetCallback callback;
 		SessionPtr session;
 	};
-	
+
 	struct DisableWaiter {
 		ProcessPtr process;
 		DisableCallback callback;
-		
+
 		DisableWaiter(const ProcessPtr &_process, const DisableCallback &_callback)
 			: process(_process),
 			  callback(_callback)
@@ -92,7 +92,7 @@ public:
 			  finished(_finished)
 			{ }
 	};
-	
+
 	/**
 	 * Protects `lifeStatus`.
 	 */
@@ -102,7 +102,7 @@ public:
 	 *
 	 * Do not access directly, always use `isAlive()`/`getLifeStatus()` or
 	 * through `lifetimeSyncher`.
-	 * 
+	 *
 	 * Invariant:
 	 *    if lifeStatus != ALIVE:
 	 *       enabledCount == 0
@@ -181,8 +181,8 @@ public:
 	boost::condition_variable detachedProcessesCheckerCond;
 	Callback shutdownCallback;
 	GroupPtr selfPointer;
-	
-	
+
+
 	static void _onSessionInitiateFailure(Session *session) {
 		ProcessPtr process = session->getProcess();
 		assert(process != NULL);
@@ -194,8 +194,9 @@ public:
 		assert(process != NULL);
 		process->getGroup()->onSessionClose(process, session);
 	}
-	
+
 	static string generateSecret(const SuperGroupPtr &superGroup);
+	static string generateUuid(const SuperGroupPtr &superGroup);
 	void onSessionInitiateFailure(const ProcessPtr &process, Session *session);
 	void onSessionClose(const ProcessPtr &process, Session *session);
 
@@ -231,7 +232,7 @@ public:
 
 	void verifyInvariants() const {
 		// !a || b: logical equivalent of a IMPLIES b.
-		
+
 		assert(enabledCount >= 0);
 		assert(disablingCount >= 0);
 		assert(disabledCount >= 0);
@@ -245,7 +246,7 @@ public:
 		assert(!( !getWaitlist.empty() ) || ( enabledProcesses.empty() || verifyNoRequestsOnGetWaitlistAreRoutable() ));
 		assert(!( enabledProcesses.empty() && !m_spawning && !restarting() && !poolAtFullCapacity() ) || ( getWaitlist.empty() ));
 		assert(!( !getWaitlist.empty() ) || ( !enabledProcesses.empty() || m_spawning || restarting() || poolAtFullCapacity() ));
-		
+
 		// Verify disableWaitlist invariants.
 		assert((int) disableWaitlist.size() >= disablingCount);
 
@@ -319,7 +320,7 @@ public:
 		return true;
 	}
 	#endif
-	
+
 	/**
 	 * Sets options for this Group. Called at creation time and at restart time.
 	 */
@@ -328,8 +329,9 @@ public:
 		options.persist(newOptions);
 		options.clearPerRequestFields();
 		options.groupSecret = secret;
+		options.groupUuid   = uuid;
 	}
-	
+
 	/**
 	 * Merges some of the new options from the latest get() request into this Group.
 	 */
@@ -339,7 +341,7 @@ public:
 		options.statThrottleRate = other.statThrottleRate;
 		options.maxPreloaderIdleTime = other.maxPreloaderIdleTime;
 	}
-	
+
 	static void runAllActions(const vector<Callback> &actions) {
 		vector<Callback>::const_iterator it, end = actions.end();
 		for (it = actions.begin(); it != end; it++) {
@@ -556,7 +558,7 @@ public:
 			it->callback(it->session, ExceptionPtr());
 		}
 	}
-	
+
 	void assignSessionsToGetWaiters(vector<Callback> &postLockActions) {
 		unsigned int i = 0;
 		bool done = false;
@@ -596,7 +598,7 @@ public:
 		}
 		clearDisableWaitlist(DR_ERROR, postLockActions);
 	}
-	
+
 	void removeFromDisableWaitlist(const ProcessPtr &p, DisableResult result,
 		vector<Callback> &postLockActions)
 	{
@@ -657,7 +659,7 @@ public:
 		}
 		selfPointer.reset();
 	}
-	
+
 public:
 	Options options;
 	/** This name uniquely identifies this Group within its Pool. It can also be used as the display name. */
@@ -666,8 +668,13 @@ public:
 	 * intra-group process communication.
 	 */
 	const string secret;
+	/** A UUID that's generated on Group initialization, and changes every time
+	 * the Group receives a restart command. Allows Union Station to track app
+	 * restarts. This information is public.
+	 */
+	string uuid;
 	ComponentInfo componentInfo;
-	
+
 	/**
 	 * Processes are categorized as enabled, disabling or disabled.
 	 *
@@ -743,35 +750,35 @@ public:
 	 *    process.pqHandle == NULL
 	 */
 	ProcessList detachedProcesses;
-	
+
 	/**
 	 * get() requests for this group that cannot be immediately satisfied are
 	 * put on this wait list, which must be processed as soon as the necessary
 	 * resources have become free.
-	 * 
+	 *
 	 * ### Invariant 1 (safety)
-	 * 
+	 *
 	 * If requests are queued in the getWaitlist, then that's because there are
 	 * no processes that can serve them.
-	 * 
+	 *
 	 *    if getWaitlist is non-empty:
 	 *       enabledProcesses.empty() || (no request in getWaitlist is routeable)
 	 *
 	 * Here, "routeable" is defined as `route(options).process != NULL`.
-	 * 
+	 *
 	 * ### Invariant 2 (progress)
 	 *
 	 * The only reason why there are no enabled processes, while at the same time we're
 	 * not spawning or waiting for pool capacity, is because there is nothing to do.
-	 * 
+	 *
 	 *    if enabledProcesses.empty() && !m_spawning && !restarting() && !poolAtFullCapacity():
 	 *       getWaitlist is empty
-	 * 
+	 *
 	 * Equivalently:
 	 * If requests are queued in the getWaitlist, then either we have processes that can process
 	 * them (some time in the future), or we're actively trying to spawn processes, unless we're
 	 * unable to do that because of resource limits.
-	 * 
+	 *
 	 *    if getWaitlist is non-empty:
 	 *       !enabledProcesses.empty() || m_spawning || restarting() || poolAtFullCapacity()
 	 */
@@ -785,7 +792,7 @@ public:
 	 *    disableWaitlist.size() >= disablingCount
 	 */
 	deque<DisableWaiter> disableWaitlist;
-	
+
 	/**
 	 * Invariant:
 	 *    (lifeStatus == ALIVE) == (spawner != NULL)
@@ -840,19 +847,19 @@ public:
 	SuperGroupPtr getSuperGroup() const {
 		return superGroup.lock();
 	}
-	
+
 	void setSuperGroup(const SuperGroupPtr &superGroup) {
 		assert(this->superGroup.lock() == NULL);
 		this->superGroup = superGroup;
 	}
-	
+
 	/**
 	 * Thread-safe.
 	 * @pre getLifeState() != SHUT_DOWN
 	 * @post result != NULL
 	 */
 	PoolPtr getPool() const;
-	
+
 	// Thread-safe.
 	bool isAlive() const {
 		boost::lock_guard<boost::mutex> lock(lifetimeSyncher);
@@ -900,7 +907,7 @@ public:
 				}
 			}
 		}
-		
+
 		if (OXT_UNLIKELY(newOptions.noop)) {
 			ProcessPtr process = boost::make_shared<Process>(
 				0, string(), string(),
@@ -911,7 +918,7 @@ public:
 			process->setGroup(shared_from_this());
 			return boost::make_shared<Session>(process, (Socket *) NULL);
 		}
-		
+
 		if (OXT_UNLIKELY(enabledCount == 0)) {
 			/* We don't have any processes yet, but they're on the way.
 			 *
@@ -972,6 +979,7 @@ public:
 	 * afterwards if necessary, e.g. by calling `assignSessionsToGetWaiters()`.
 	 */
 	AttachResult attach(const ProcessPtr &process, vector<Callback> &postLockActions) {
+		TRACE_POINT();
 		assert(process->getGroup() == NULL || process->getGroup().get() == this);
 		assert(process->isAlive());
 		assert(isAlive());
@@ -1032,10 +1040,16 @@ public:
 	 * that method over this one.
 	 */
 	void detach(const ProcessPtr &process, vector<Callback> &postLockActions) {
+		TRACE_POINT();
 		assert(process->getGroup().get() == this);
 		assert(process->isAlive());
 		assert(isAlive());
 
+		if (process->enabled == Process::DETACHED) {
+			P_DEBUG("Detaching process " << process->inspect() << ", which was already being detached");
+			return;
+		}
+
 		const ProcessPtr p = process; // Keep an extra reference just in case.
 		P_DEBUG("Detaching process " << process->inspect());
 
@@ -1048,6 +1062,7 @@ public:
 				removeFromDisableWaitlist(process, DR_NOOP, postLockActions);
 			}
 		} else {
+			assert(process->enabled == Process::DISABLED);
 			assert(!disabledProcesses.empty());
 			removeProcessFromList(process, disabledProcesses);
 		}
@@ -1057,7 +1072,7 @@ public:
 
 		postLockActions.push_back(boost::bind(&Group::runDetachHooks, this, process));
 	}
-	
+
 	/**
 	 * Detaches all processes from this Group. This function doesn't touch
 	 * getWaitlist so be sure to fix its invariants afterwards if necessary.
@@ -1076,7 +1091,7 @@ public:
 		foreach (ProcessPtr process, disabledProcesses) {
 			addProcessToList(process, detachedProcesses);
 		}
-		
+
 		enabledProcesses.clear();
 		disablingProcesses.clear();
 		disabledProcesses.clear();
@@ -1087,7 +1102,7 @@ public:
 		clearDisableWaitlist(DR_NOOP, postLockActions);
 		startCheckingDetachedProcesses(false);
 	}
-	
+
 	/**
 	 * Marks the given process as enabled. This function doesn't touch getWaitlist
 	 * so be sure to fix its invariants afterwards if necessary.
@@ -1110,7 +1125,7 @@ public:
 			P_DEBUG("Enabling ENABLED process " << process->inspect());
 		}
 	}
-	
+
 	/**
 	 * Marks the given process as disabled. Returns DR_SUCCESS, DR_DEFERRED
 	 * or DR_NOOP. If the result is DR_DEFERRED, then the callback will be
@@ -1271,7 +1286,7 @@ public:
 				(unsigned long long) options.getMaxPreloaderIdleTime() * 1000000; */
 		return false;
 	}
-	
+
 	/** Whether a new process should be spawned for this group. */
 	bool shouldSpawn() const;
 	/** Whether a new process should be spawned for this group in the
@@ -1288,7 +1303,7 @@ public:
 			&& !processUpperLimitsReached()
 			&& !poolAtFullCapacity();
 	}
-	
+
 	bool needsRestart(const Options &options) {
 		if (m_restarting) {
 			return false;
@@ -1316,6 +1331,7 @@ public:
 		stream << "<app_root>" << escapeForXml(options.appRoot) << "</app_root>";
 		stream << "<app_type>" << escapeForXml(options.appType) << "</app_type>";
 		stream << "<environment>" << escapeForXml(options.environment) << "</environment>";
+		stream << "<uuid>" << toString(uuid) << "</uuid>";
 		stream << "<enabled_process_count>" << enabledCount << "</enabled_process_count>";
 		stream << "<disabling_process_count>" << disablingCount << "</disabling_process_count>";
 		stream << "<disabled_process_count>" << disabledCount << "</disabled_process_count>";
@@ -1351,7 +1367,7 @@ public:
 		stream << "</options>";
 
 		stream << "<processes>";
-		
+
 		for (it = enabledProcesses.begin(); it != enabledProcesses.end(); it++) {
 			stream << "<process>";
 			(*it)->inspectXml(stream, includeSecrets);