Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace recursive calls with while loop when waiting for sync-lock (#1637)

Browse source
This commit is contained in:
Thomas Bruederli 2013-05-27 17:27:53 +02:00
parent f4a2765243
commit 44c19b496c
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
plugins/libkolab/lib/kolab_storage_cache.php
View file

@ -36,6 +36,7 @@ class kolab_storage_cache
private $synclock = false; private $synclock = false;
private $ready = false; private $ready = false;
private $max_sql_packet = 1046576; // 1 MB - 2000 bytes private $max_sql_packet = 1046576; // 1 MB - 2000 bytes
private $max_sync_lock_time = 600;
private $binary_cols = array('photo','pgppublickey','pkcs7publickey'); private $binary_cols = array('photo','pgppublickey','pkcs7publickey');
@ -92,7 +93,7 @@ class kolab_storage_cache
return; return;
// increase time limit // increase time limit
@set_time_limit(500); @set_time_limit($this->max_sync_lock_time);
// lock synchronization for this folder or wait if locked // lock synchronization for this folder or wait if locked
$this->_sync_lock(); $this->_sync_lock();
@ -674,12 +675,9 @@ class kolab_storage_cache
if (!$this->ready) if (!$this->ready)
return; return;
$sql_arr = $this->db->fetch_assoc($this->db->query( $sql_query = "SELECT msguid AS locked, ".$this->db->unixtimestamp('created')." AS created FROM kolab_cache ".
"SELECT msguid AS locked, ".$this->db->unixtimestamp('created')." AS created FROM kolab_cache ". "WHERE resource=? AND type=?";
"WHERE resource=? AND type=?", $sql_arr = $this->db->fetch_assoc($this->db->query($sql_query, $this->resource_uri, 'lock'));
$this->resource_uri,
'lock'
));
// abort if database is not set-up // abort if database is not set-up
if ($this->db->is_error()) { if ($this->db->is_error()) {
@ -689,6 +687,12 @@ class kolab_storage_cache
$this->synclock = true; $this->synclock = true;
// wait if locked (expire locks after 10 minutes)
while ($sql_arr && intval($sql_arr['locked']) > 0 && $sql_arr['created'] + $this->max_sync_lock_time > time()) {
usleep(500000);
$sql_arr = $this->db->fetch_assoc($this->db->query($sql_query, $this->resource_uri, 'lock'));
}
// create lock record if not exists // create lock record if not exists
if (!$sql_arr) { if (!$sql_arr) {
$this->db->query( $this->db->query(
@ -699,12 +703,6 @@ class kolab_storage_cache
date('Y-m-d H:i:s') date('Y-m-d H:i:s')
); );
} }
// wait if locked (expire locks after 10 minutes)
else if (intval($sql_arr['locked']) > 0 && (time() - $sql_arr['created']) < 600) {
usleep(500000);
return $this->_sync_lock();
}
// set lock
else { else {
$this->db->query( $this->db->query(
"UPDATE kolab_cache SET msguid=1, created=? ". "UPDATE kolab_cache SET msguid=1, created=? ".