Opimization around makeLocalTree and makeRemoteTree (#7169 & #7170)

Benjamin Renard
1 parent 2b73f0c5
Showing 2 changed files with 55 additions and 18 deletions Show diff stats
php/classes/UserMgr.php
php/config.php
@@ -22,6 +22,7 @@ class UserMgr
 					'USERWORKINGDIR' =>'RES', 'USERTTDIR' => 'TT', 'USERJOBDIR' => 'JOBS',
 					'USERTEMPDIR' => 'TEMP');	
 	protected $userGrps;
+	protected $userGrpsCheckSum; //use to know if there is a modification in user groups
 	protected $amdaClient; //client to dd webservice
 	protected $paramMgr, $baseExtXml;
  
@@ -136,14 +137,18 @@ class UserMgr
 		return true;
 	}
  
-	protected function getUserGrps() 
+	protected function loadUserGrps() 
 	{
+		if (isset($this->userGrps)) {
+			return;
+		}
 		$info = $this->amdaClient->getUserInfo($this->user); 
-		
-		if (empty($info['group']))
-				return null;
-		else
-				return explode(',',$info['group']);
+
+		$this->userGrpsCheckSum = '';
+		if (!empty($info['group'])) {
+			$this->userGrpsCheckSum = md5($info['group']);
+			$this->userGrps = explode(',',$info['group']);
+		}
 	}
  
 	/*
@@ -152,6 +157,9 @@ class UserMgr
 	*/
 	protected function isSpecialGroup() 
 	{
+		if (!isset($this->userGrps))
+			return NULL;
+
 		$specialGrps = new DomDocument("1.0");
  
 		if (!($specialGrps->load(specialGrpsXml))) return null; 
@@ -259,7 +267,13 @@ class UserMgr
 				foreach ($basesWS  as $base) 
 				{
 					$baseId = $base->getAttribute('xml:id');
-					 
+					$lastModif = $base->getAttribute('lastModif');
+					if (!empty($lastModif)) {
+						$lastModif = intval($lastModif);
+						if (($lastModif > 0) && ((time() - $lastModif) < REMOTE_PARAMS_UPDATE_DELAY)) {
+							continue;
+						} 
+					}
 					if (!$this->baseExtXml->load(RemoteData.$baseId.'/base.xml')) 
 					{ 
 						$base->setAttribute("desc","ATTENTION!!! This DataCenter DOES NOT EXIST ANY MORE!!! Remove it from your tree");                                                                         
@@ -270,6 +284,7 @@ class UserMgr
 					}
  
 					if ($base->hasAttribute('addable')) {
+						$base->setAttribute('lastModif', time());
 					  //   keep this base tree 
 					  //	 error_log($baseId,1,email);
 					}
@@ -294,6 +309,8 @@ class UserMgr
  
 						$centerNode->setAttribute('name', $base->getAttribute('name'));
 						$centerNode->setAttribute('desc', $base->getAttribute('desc'));
+						$centerNode->setAttribute('lastModif', time());
+						
  
 						$base->parentNode->removeChild($base);
  
@@ -355,7 +372,7 @@ class UserMgr
 			$this->paramMgr->xmlDom->appendChild($BASE);
  
 			return $this->paramMgr->xmlDom->save($this->paramMgr->xmlName);
-	   }  
+	   }
 	}
  
 	protected function makeNewBase($baseId)
@@ -546,8 +563,6 @@ class UserMgr
  
 		$this->setPath(); 		
  
-		$this->userGrps = $this->getUserGrps();
-		  		
 		if (!$this->makeLocalTree())
 				die("Login for ".$this->user." failed: Can't make LocalParams.xml");;
  
@@ -568,7 +583,7 @@ class UserMgr
 		/*
 		* Special groups are defined in the generic_data/SpecialSettings/Groups.xml
 		*/
-		if ($this->userGrps) {
+		if (isset($this->userGrps)) {
 		//	$specialGroup = $this->isSpecialGroup();
 			$specialGroup = false;
 			// Special Info for special groups
@@ -602,20 +617,40 @@ class UserMgr
  
 	protected function makeLocalTree()
 	{
-		if (file_exists(USERWSDIR.'LocalParams.xml'))
-				unlink(USERWSDIR.'LocalParams.xml');  
+		$this->loadUserGrps();
+
+		if (file_exists(USERWSDIR.'LocalParams.xml')) {
+			if (file_exists(USERWSDIR.'userGrpsChecksum')) {
+				$lastGrpsChecksum = file_get_contents(USERWSDIR.'userGrpsChecksum');
+				if ($lastGrpsChecksum == $this->userGrpsCheckSum) {
+					//No modification in groups for this user
+					if (filemtime(USERWSDIR.'LocalParams.xml') == filemtime(LocalData.'/LocalParams.xml')) {
+						//And no modification in LocalParams file => skip makeLocalTree
+						return true;
+					}
+				}
+			}
+			unlink(USERWSDIR.'LocalParams.xml');
+		}
  
 		if (!copy(LocalData.'/LocalParams.xml', USERWSDIR.'LocalParams.xml'))
-				die("Login for ".$this->user." failed: Can't copy LocalParams.xml"); 
-				
-		if ($this->userGrps)
-				return $this->updateTreeForGrps(USERWSDIR.'LocalParams.xml');
+				die("Login for ".$this->user." failed: Can't copy LocalParams.xml");
+		//Save groups checksum used to generate this user local tree
+		file_put_contents(USERWSDIR.'userGrpsChecksum', $this->userGrpsCheckSum);
  
-		return true;
+		$result = $this->updateTreeForGrps(USERWSDIR.'LocalParams.xml');
+
+		//Set modif time to the original one
+		touch(USERWSDIR.'LocalParams.xml', filemtime(LocalData.'/LocalParams.xml'));
+
+		return TRUE;
 	}
  
 	protected function updateTreeForGrps($file)
 	{
+		if (!isset($this->userGrps))
+			return TRUE;
+
 		$xml = new DomDocument("1.0");
  
 		if(!$xml->load($file)) 
@@ -66,6 +66,8 @@ ini_set(&#39;user_agent&#39;, &#39;Mozilla/5.0 (X11; U; Linux i686; en-US; rv:7.0) Gecko/201
 // ini_set('upload_max_filesize',100000000);
 // ini_set('post_max_size',1050000000);
  
+// Delay between two update of remote parameters (in sec.)
+define('REMOTE_PARAMS_UPDATE_DELAY', 3600);
  
 // General Info dirs
 define('DATAPATH', IHM_SRC_DIR.'/generic_data/');