Fix setting max packet size for DB caches and check packet size also in shared cache

pull/257/head
Aleksander Machniak 10 years ago
parent 2e28a74ce9
commit 81d4ff214e

@ -4,6 +4,7 @@ CHANGELOG Roundcube Webmail
- Plugin API: Add special onload() method to execute plugin actions before startup (session and GUI initialization) - Plugin API: Add special onload() method to execute plugin actions before startup (session and GUI initialization)
- Add possibility to print contact information (of a single contact) - Add possibility to print contact information (of a single contact)
- Fix refreshing of drafts list when sending a message which was saved in meantime (#1490238) - Fix refreshing of drafts list when sending a message which was saved in meantime (#1490238)
- Fix setting max packet size for DB caches and check packet size also in shared cache
RELEASE 1.1.0 RELEASE 1.1.0
------------- -------------

@ -605,8 +605,8 @@ class rcube_cache
$this->max_packet = 2097152; // default/max is 2 MB $this->max_packet = 2097152; // default/max is 2 MB
if ($this->type == 'db') { if ($this->type == 'db') {
$value = $this->db->get_variable('max_allowed_packet', 1048500); $value = $this->db->get_variable('max_allowed_packet', $this->max_packet);
$this->max_packet = min($value, $this->max_packet) - 2000; $this->max_packet = max($value, $this->max_packet) - 2000;
} }
else if ($this->type == 'memcache') { else if ($this->type == 'memcache') {
$stats = $this->db->getStats(); $stats = $this->db->getStats();

@ -44,6 +44,7 @@ class rcube_cache_shared
private $cache = array(); private $cache = array();
private $cache_changes = array(); private $cache_changes = array();
private $cache_sums = array(); private $cache_sums = array();
private $max_packet = -1;
/** /**
@ -312,7 +313,7 @@ class rcube_cache_shared
* Writes single cache record into DB. * Writes single cache record into DB.
* *
* @param string $key Cache key name * @param string $key Cache key name
* @param mxied $data Serialized cache data * @param mixed $data Serialized cache data
* *
* @param boolean True on success, False on failure * @param boolean True on success, False on failure
*/ */
@ -322,6 +323,12 @@ class rcube_cache_shared
return false; return false;
} }
// don't attempt to write too big data sets
if (strlen($data) > $this->max_packet_size()) {
trigger_error("rcube_cache: max_packet_size ($this->max_packet) exceeded for key $key. Tried to write " . strlen($data) . " bytes", E_USER_WARNING);
return false;
}
if ($this->type == 'memcache' || $this->type == 'apc') { if ($this->type == 'memcache' || $this->type == 'apc') {
return $this->add_record($this->ckey($key), $data); return $this->add_record($this->ckey($key), $data);
} }
@ -578,4 +585,30 @@ class rcube_cache_shared
return $this->packed ? @unserialize($data) : $data; return $this->packed ? @unserialize($data) : $data;
} }
/**
* Determine the maximum size for cache data to be written
*/
private function max_packet_size()
{
if ($this->max_packet < 0) {
$this->max_packet = 2097152; // default/max is 2 MB
if ($this->type == 'db') {
$value = $this->db->get_variable('max_allowed_packet', 1048500);
$this->max_packet = min($value, $this->max_packet) - 2000;
}
else if ($this->type == 'memcache') {
$stats = $this->db->getStats();
$remaining = $stats['limit_maxbytes'] - $stats['bytes'];
$this->max_packet = min($remaining / 5, $this->max_packet);
}
else if ($this->type == 'apc' && function_exists('apc_sma_info')) {
$stats = apc_sma_info();
$this->max_packet = min($stats['avail_mem'] / 5, $this->max_packet);
}
}
return $this->max_packet;
}
} }

Loading…
Cancel
Save