strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

wsd: detect and fail child forking when forkit is down

Browse source 
Change-Id: I97ba133b0285403b7dfa4b6a6cbef26b818dcaf3
Reviewed-on: https://gerrit.libreoffice.org/33132
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2017-01-15 12:57:22 -05:00 committed by Ashod Nakashian
parent 818329d66e
commit e3aec0e6c4
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
wsd/LOOLWSD.cpp
View file

@ -389,7 +389,7 @@ static bool rebalanceChildren(int balance)
return forkChildren(balance); return forkChildren(balance);
} }
return false; return true;
} }
/// Called on startup only. /// Called on startup only.
@ -473,7 +473,11 @@ static std::shared_ptr<ChildProcess> getNewChild()
LOG_DBG("getNewChild: Rebalancing children."); LOG_DBG("getNewChild: Rebalancing children.");
int numPreSpawn = LOOLWSD::NumPreSpawnedChildren; int numPreSpawn = LOOLWSD::NumPreSpawnedChildren;
++numPreSpawn; // Replace the one we'll dispatch just now. ++numPreSpawn; // Replace the one we'll dispatch just now.
rebalanceChildren(numPreSpawn); if (!rebalanceChildren(numPreSpawn))
{
// Fatal. Let's fail and retry at a higher level.
return nullptr;
}
LOG_TRC("Waiting for a new child for a max of " << CHILD_TIMEOUT_MS << " ms."); LOG_TRC("Waiting for a new child for a max of " << CHILD_TIMEOUT_MS << " ms.");
const auto timeout = chrono::milliseconds(CHILD_TIMEOUT_MS); const auto timeout = chrono::milliseconds(CHILD_TIMEOUT_MS);
@ -1673,7 +1677,7 @@ inline std::string getAdminURI(const Poco::Util::LayeredConfiguration &config)
} // anonymous namespace } // anonymous namespace
std::atomic<unsigned> LOOLWSD::NextSessionId; std::atomic<unsigned> LOOLWSD::NextSessionId;
int LOOLWSD::ForKitWritePipe = -1; std::atomic<int> LOOLWSD::ForKitWritePipe(-1);
bool LOOLWSD::NoCapsForKit = false; bool LOOLWSD::NoCapsForKit = false;
std::string LOOLWSD::Cache = LOOLWSD_CACHEDIR; std::string LOOLWSD::Cache = LOOLWSD_CACHEDIR;
std::string LOOLWSD::SysTemplate; std::string LOOLWSD::SysTemplate;
@ -2073,8 +2077,13 @@ void LOOLWSD::displayHelp()
Process::PID LOOLWSD::createForKit() Process::PID LOOLWSD::createForKit()
{ {
Process::Args args; LOG_INF("Creating new forkit process.");
const int oldForKitWritePipe = ForKitWritePipe;
ForKitWritePipe = -1;
close(oldForKitWritePipe);
Process::Args args;
args.push_back("--losubpath=" + std::string(LO_JAIL_SUBPATH)); args.push_back("--losubpath=" + std::string(LO_JAIL_SUBPATH));
args.push_back("--systemplate=" + SysTemplate); args.push_back("--systemplate=" + SysTemplate);
args.push_back("--lotemplate=" + LoTemplate); args.push_back("--lotemplate=" + LoTemplate);
@ -2271,7 +2280,6 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
} }
// Spawn a new forkit and try to dust it off and resume. // Spawn a new forkit and try to dust it off and resume.
close(ForKitWritePipe);
forKitPid = createForKit(); forKitPid = createForKit();
if (forKitPid < 0) if (forKitPid < 0)
{ {
@ -2306,7 +2314,6 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
{ {
// No child processes. // No child processes.
// Spawn a new forkit and try to dust it off and resume. // Spawn a new forkit and try to dust it off and resume.
close(ForKitWritePipe);
forKitPid = createForKit(); forKitPid = createForKit();
if (forKitPid < 0) if (forKitPid < 0)
{ {

2
wsd/LOOLWSD.hpp
View file

@ -36,7 +36,7 @@ public:
static std::atomic<unsigned> NextSessionId; static std::atomic<unsigned> NextSessionId;
static unsigned int NumPreSpawnedChildren; static unsigned int NumPreSpawnedChildren;
static bool NoCapsForKit; static bool NoCapsForKit;
static int ForKitWritePipe; static std::atomic<int> ForKitWritePipe;
static std::string Cache; static std::string Cache;
static std::string SysTemplate; static std::string SysTemplate;
static std::string LoTemplate; static std::string LoTemplate;