composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

#1039: prevent concurrent executions of either synchro_import.php or synchro_exec.php for a given data source, since it would lead to unpredictable results.

Browse Source 
SVN:trunk[3465]
This commit is contained in:
Denis Flaven
2014-12-15 15:04:43 +00:00
parent bd5268dc42
commit 3c9ace5b53
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
synchro/synchro_import.php
View File

@@ -468,8 +468,10 @@ try
// Prepare insert columns
$sInsertColumns = '`'.implode('`, `', $aInputColumns).'`';
foreach($aData as $iRow => $aRow)
{
$oMutex = new iTopMutex('synchro_import_'.$oDataSource->GetKey().'_'.$oConfig->GetDBName().'_'.$oConfig->GetDBSubname());
$oMutex->Lock();
foreach($aData as $iRow => $aRow)
{
$sReconciliationCondition = "`primary_key` = ".CMDBSource::Quote($aRow[$iPrimaryKeyCol]);
$sSelect = "SELECT COUNT(*) FROM `$sTable` WHERE $sReconciliationCondition";
$aRes = CMDBSource::QueryToArray($sSelect);
@@ -597,7 +599,8 @@ try
$oP->add("$iRow: Error - Failed to reconcile, found $iCount rows having '$sReconciliationCondition'\n");
}
}
$oMutex->Unlock();
if (($sOutput == "summary") || ($sOutput == 'details'))
{
$oP->add_comment("Data Source: ".$iDataSourceId);

8
synchro/synchrodatasource.class.inc.php
View File

@@ -2414,10 +2414,14 @@ class SynchroExecution
$this->PrepareLogs();
self::$m_oCurrentTask = $this->m_oDataSource;
$oMutex = new iTopMutex('synchro_process_'.$this->m_oDataSource->GetKey().'_'.$oConfig->GetDBName().'_'.$oConfig->GetDBSubname());
try
{
$oMutex->Lock();
$this->DoSynchronize();
$oMutex->Unlock();
$this->m_oStatLog->Set('end_date', time());
$this->m_oStatLog->Set('status', 'completed');
$this->m_oStatLog->DBUpdateTracked($this->m_oChange);
@@ -2459,6 +2463,7 @@ class SynchroExecution
}
catch (SynchroExceptionNotStarted $e)
{
$oMutex->Unlock();
// Set information for reporting... but delete the object in DB
$this->m_oStatLog->Set('end_date', time());
$this->m_oStatLog->Set('status', 'error');
@@ -2468,6 +2473,7 @@ class SynchroExecution
}
catch (Exception $e)
{
$oMutex->Unlock();
$this->m_oStatLog->Set('end_date', time());
$this->m_oStatLog->Set('status', 'error');
$this->m_oStatLog->Set('last_error', $e->getMessage());