Merge master

Benjamin Renard
2 parents 53fc468c 1903e7e0
Showing 11 changed files with 165 additions and 23 deletions Show diff stats
src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php
src/InputOutput/IHMImpl/Process/IHMInputOutputCleanProcessClass.php
src/InputOutput/IHMImpl/Process/IHMInputOutputDeleteProcessClass.php
src/InputOutput/IHMImpl/Process/IHMInputOutputGetInfoProcessClass.php
src/InputOutput/IHMImpl/Process/IHMInputOutputInfoProcessAbstractClass.php
src/Request/Config/KernelConfigClass.php
src/Request/ParamsRequestImpl/ParamsRequestClass.php
src/Request/ProcessRequestImpl/Process/ProcessClass.php
src/Request/ProcessRequestImpl/Process/ProcessManagerClass.php
src/Request/ProcessRequestImpl/ProcessRequestClass.php
src/Request/ProcessRequestImpl/ProcessRequestDataClass.php
@@ -161,6 +161,7 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 			$deleteData->setManagerFilePath(IHMConfigClass::getProcessManagerFilePath());
 			$deleteData->setType(ProcessTypeEnumClass::DELETE);
 			$deleteData->setId($jobId);
+			$deleteData->setUser(IHMConfigClass::getUserName());
  
 			$processRequest = new ProcessRequestClass();
 			$processRequest->setData($deleteData);
@@ -219,6 +220,7 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 		$this->paramsData->setLocalBasePath(IHMConfigClass::getLocalBasePath());
 		$this->paramsData->setManagerFilePath(IHMConfigClass::getProcessManagerFilePath());
 		$this->paramsData->setTask($this->getTask($input));
+		$this->paramsData->setUser(IHMConfigClass::getUserName());
 		$this->input = $input;
  
 		return $this->unmarshallRequest($input);
@@ -43,6 +43,7 @@ class IHMInputOutputCleanProcessClass implements InputOutputInterface
 			$processData->setManagerFilePath(IHMConfigClass::getProcessManagerFilePath());
 			$processData->setType(ProcessTypeEnumClass::DELETE);
 			$processData->setId($jobid);
+			$processData->setUser(IHMConfigClass::getUserName());
  
 			$this->processDatas[] = $processData;
 		}
@@ -69,4 +70,4 @@ class IHMInputOutputCleanProcessClass implements InputOutputInterface
 	}
 }
  
-?>
 \ No newline at end of file
+?>
@@ -32,6 +32,7 @@ class IHMInputOutputDeleteProcessClass implements InputOutputInterface
 		$this->paramsData->setType(ProcessTypeEnumClass::DELETE);
  
 		$this->paramsData->setId($input->id);
+		$this->paramsData->setUser(IHMConfigClass::getUserName());
  
 		return $this->paramsData;
 	}
@@ -63,4 +64,4 @@ class IHMInputOutputDeleteProcessClass implements InputOutputInterface
 	}
 }
  
-?>
 \ No newline at end of file
+?>
@@ -32,6 +32,7 @@ class IHMInputOutputGetInfoProcessClass implements InputOutputInterface
 		$this->paramsData->setType(ProcessTypeEnumClass::INFO);
  
 		$this->paramsData->setId($input);
+		$this->setUser(IHMConfigClass::getUserName());
  
 		return $this->paramsData;
 	}
@@ -35,6 +35,7 @@ abstract class IHMInputOutputInfoProcessAbstractClass implements InputOutputInte
 			$processData->setManagerFilePath(IHMConfigClass::getProcessManagerFilePath());
 			$processData->setType(ProcessTypeEnumClass::INFO);
 			$processData->setId($jobid);
+			$processData->setUser(IHMConfigClass::getUserName());
  
 			$this->processDatas[] = $processData;
 		}
@@ -61,4 +62,4 @@ abstract class IHMInputOutputInfoProcessAbstractClass implements InputOutputInte
 	abstract protected function marshallResult($data);
 }
  
-?>
 \ No newline at end of file
+?>
@@ -26,6 +26,9 @@ class KernelConfigClass
  
 	private static $defaultGapThreshold = "5";
  
+	private static $nbMaxProcessByUser = 10;
+	private static $nbMaxProcessGlobal = 100;
+
  
 	private static $userHost       = "";
 	private static $userName       = "";
@@ -173,6 +176,16 @@ class KernelConfigClass
 		return self::$timeToBatchMode;
 	}
  
+	public static function getNbMaxProcessByUser()
+	{
+		return self::$nbMaxProcessByUser;
+	}
+
+	public static function getNbMaxProcessGlobal()
+	{
+		return self::$nbMaxProcessGlobal;
+	}
+
 	public static function write($working_dir, $compilation_path = "", $localbase_path = "", $functionsfile_path = "", $constantsfile_path = "", $paramtemplatesfile_path = "")
 	{
 		//create app.properties file
@@ -232,11 +232,10 @@ class ParamsRequestClass extends ProcessRequestClass
 	*/
 	public function run()
 	{
-		$amdaStat = new AmdaStats(IHMConfigClass::getUserName());
-
-		$task = $this->requestData->getTask();
-		if (isset($task) && (count($this->requestData->getDatasetForStat()) > 0))
-			$amdaStat->addTask(IHMConfigClass::getUserName(), $task, $this->requestData->getDatasetForStat());
+		$amdaStat = new AmdaStats($this->requestData->getUser());
+		
+		if (count($this->requestData->getDatasetForStat()) > 0)
+			$amdaStat->addTask(IHMConfigClass::getUserName(), $this->requestData->getTask(), $this->requestData->getDatasetForStat());
  
 		return parent::run();
 	}
@@ -20,17 +20,19 @@ class ProcessClass
 	private $runningPath;
 	private $runningStart;
 	private $fromWS;
+	private $user;
  
 	/*
 	 * @brief Constructor
 	*/
-	function __construct($command, $postProcessCmd = "", $getErrorMsgCmd = "", $fromWS = FALSE)
+	function __construct($command, $postProcessCmd = "", $getErrorMsgCmd = "", $user = "", $fromWS = FALSE)
 	{
 		$this->command        = $command;
 		$this->postProcessCmd = $postProcessCmd;
 		$this->getErrorMsgCmd = $getErrorMsgCmd;
 		$this->pID            = 0;
 		$this->fromWS         = $fromWS;
+		$this->user           = $user;
 	}
  
 	/*
@@ -197,6 +199,14 @@ class ProcessClass
 	}
  
 	/*
+	 * @brief Get user that run the request. Empty if not known.
+	 */
+	public function getUser()
+	{
+		return $this->user;
+	}
+
+	/*
 	 * @brief Run the process
 	*/
 	public function run($runningPath, $envArray)
@@ -19,9 +19,9 @@ class ProcessManagerClass
 	/*
 	 * @brief Run a process
 	*/
-	public function runProcess($cmd, $runningPath, $envArray, $postProcessCmd, $getErrorMsgCmd, $batchEnabled, $fromWS = FALSE)
+	public function runProcess($cmd, $runningPath, $envArray, $postProcessCmd, $getErrorMsgCmd, $batchEnabled, $user, $fromWS = FALSE)
 	{
-		$process = new ProcessClass($cmd, $postProcessCmd, $getErrorMsgCmd, $fromWS);
+		$process = new ProcessClass($cmd, $postProcessCmd, $getErrorMsgCmd, $user, $fromWS);
  
 		if (!$process->run($runningPath, $envArray))
 			return array("success" => false, "message" => "Cannot run the process");
@@ -85,6 +85,14 @@ class ProcessManagerClass
 		return true;
 	}
  
+        /*
+         * @brief Get nb of running processes. Is $name is not empty, get only the nb for the specifier user.
+         */
+	public function getNbRunningProcesses($user = "") {
+		$res = $this->concurrentAccessProcessManagerFile(array($this,'getRunningProcessesNb'),$user);
+		return $res;
+	}
+
 	/*
 	 * @brief Add a process in the manager file
 	*/
@@ -123,8 +131,10 @@ class ProcessManagerClass
 				$dom->preserveWhiteSpace = false;
 				$dom->formatOutput = true;
 				$res = $dom->load($this->processManagerFilePath);
-				if ($res)
+				if ($res) {
+					$this->cleanupProcessManagerFile($dom);
 					$func_res = call_user_func($callback,$dom,$additionalParams);
+				}
 			}
 		}
 		else
@@ -151,6 +161,28 @@ class ProcessManagerClass
 	}
  
 	/*
+	 * @brief Method used to be sure that the process file is always clean
+	 */
+	private function cleanupProcessManagerFile($dom) {
+		$processNodes = $dom->documentElement->getElementsByTagName("process");
+		$processNode = $processNodes->item(0);
+		$to_remove = array();
+		while ($processNode)
+		{
+			$pathNodes = $processNode->getElementsByTagName("runningpath");
+			if (($pathNodes->length == 0) || empty($pathNodes->item(0)->nodeValue) ||
+				(!is_dir($pathNodes->item(0)->nodeValue))) {
+				$to_remove[] = $processNode;
+			}
+			$processNode = $this->fNextEltSibling($processNode);
+		}
+		foreach ($to_remove as $processNode) {
+			$dom->documentElement->removeChild($processNode);
+		}
+		$dom->save($this->processManagerFilePath);
+	}
+
+	/*
 	 * @brief Update process info if a node of the manager file
 	*/
 	private function updateProcessInProcessNode($dom, $processNode, $process) {
@@ -168,6 +200,7 @@ class ProcessManagerClass
 		$this->updateProcessStatusToNode($dom,$processNode,"runningstart",$process->getRunningStart());
 		$this->updateProcessStatusToNode($dom,$processNode,"isrunning",$process->isRunning() ? "true" : "false");
 		$this->updateProcessStatusToNode($dom,$processNode,"lastupdate",time());
+		$this->updateProcessStatusToNode($dom,$processNode,"user", $process->getUser());
 		$this->updateProcessStatusToNode($dom,$processNode,"fromws", $process->getFromWS() ? "true" : "false");
 	}
  
@@ -193,6 +226,7 @@ class ProcessManagerClass
 				"isrunning"    => ($this->getNodeValueFromNode($processNode, "isrunning") == "true"),
 				"iskilled"     => ($this->getNodeValueFromNode($processNode, "iskilled") == "true"),
 				"lastupdate"   => $this->getNodeValueFromNode($processNode, "lastupdate"),
+				"user"         => $this->getNodeValueFromNode($processNode, "user"),
 				"fromws"       => ($this->getNodeValueFromNode($processNode, "fromws") == "true"),
 		);
 	}
@@ -360,6 +394,37 @@ class ProcessManagerClass
  
 		return array('success' => false, 'message' => 'Cannot kill process from id '.$id);
 	}
+
+	/*
+	 * @brief Get nb of running processes. Is $name is not empty, get only the nb for the specifier user.
+	 */
+	private function getRunningProcessesNb($dom, $user)
+	{
+		$processNodes = $dom->documentElement->getElementsByTagName("process");
+		$processNode = $processNodes->item(0);
+		$nb = 0;
+		while ($processNode)
+		{
+			$isRunningNodes = $processNode->getElementsByTagName("isrunning");
+			if (($isRunningNodes->length == 0) || empty($isRunningNodes->item(0)->nodeValue) ||
+				($isRunningNodes->item(0)->nodeValue != "true")) {
+				$processNode = $this->fNextEltSibling($processNode);
+				continue;
+			}
+			if (!empty($user)) {
+				$userNodes = $processNode->getElementsByTagName("user");
+				if (($userNodes->length == 0) || empty($userNodes->item(0)->nodeValue) ||
+					($userNodes->item(0)->nodeValue != $user)) {
+					$processNode = $this->fNextEltSibling($processNode);
+					continue;
+				}
+			}
+			++$nb;
+			$processNode = $this->fNextEltSibling($processNode);
+		}
+
+		return array('success' => true, 'nb' => $nb);
+	}
 }
  
 ?>
@@ -103,6 +103,40 @@ class ProcessRequestClass extends RequestAbstractClass
 	}
  
 	/*
+	 *
+	 */
+	private function serverReady($processMgr, $user)
+	{
+		if (!empty($user) && !$this->requestData->getFromWS()) {
+			// Check nb running processes for the current user
+			$result = $processMgr->getNbRunningProcesses($user);
+			if (!$result['success']) {
+				return $result;
+			}
+			if ($result['result']['nb'] >= KernelConfigClass::getNbMaxProcessByUser()) {
+				return array(
+					'success' => FALSE,
+					'message' => 'You exceed the maximum number of processes allowed by user. Please wait the end of some jobs.',
+				);
+			}
+		}
+		// Check nb running processes for all users
+		$result = $processMgr->getNbRunningProcesses();
+		if (!$result['success']) {
+			return $result;
+		}
+		if ($result['result']['nb'] >= KernelConfigClass::getNbMaxProcessGlobal()) {
+			return array(
+				'success' => FALSE,
+				'message' => 'Our server is busy. Please re run your request later.',
+			);
+		}
+		return array(
+			'success' => TRUE,
+		);
+	}
+
+	/*
 	 * @brief Run a process request
 	*/
 	public function run()
@@ -120,18 +154,22 @@ class ProcessRequestClass extends RequestAbstractClass
 		switch ($this->requestData->getType())
 		{
 			case ProcessTypeEnumClass::RUN :
-				//run process
-				$result = $processMgr->runProcess(
-				$this->requestData->getCmd(),
-				$this->requestData->getWorkingPath(),
-				$this->requestData->getEnvVars(),
-				$this->requestData->getPostCmd(),
-				$this->requestData->getGetErrorMsgCmd(),
-				$this->requestData->getBatchEnable(),
-				$this->requestData->getFromWS());
+				$result = $this->serverReady($processMgr, $this->requestData->getUser());
 				if ($result['success']) {
-					$return_code = TRUE;
-					$this->updateProcess($result['result'], $processMgr);
+					//run process
+					$result = $processMgr->runProcess(
+					$this->requestData->getCmd(),
+					$this->requestData->getWorkingPath(),
+					$this->requestData->getEnvVars(),
+					$this->requestData->getPostCmd(),
+					$this->requestData->getGetErrorMsgCmd(),
+					$this->requestData->getBatchEnable(),
+					$this->requestData->getUser(),
+					$this->requestData->getFromWS());
+					if ($result['success']) {
+						$return_code = TRUE;
+						$this->updateProcess($result['result'], $processMgr);
+					}
 				}
 				break;
 			case ProcessTypeEnumClass::DELETE :
@@ -51,6 +51,7 @@ class ProcessRequestDataClass extends RequestDataClass
 	private $start           = 0;
 	private $runningPath     = "";
 	private $fromWS          = false;
+	private $user            = "";
  
 	public function getManagerFilePath()
 	{
@@ -211,6 +212,16 @@ class ProcessRequestDataClass extends RequestDataClass
 	{
 		$this->fromWS = $fromWS;
 	}
+
+	public function getUser()
+	{
+		return $this->user;
+	}
+
+	public function setUser($user)
+	{
+		$this->user = $user;
+	}
 }
  
 ?>