geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-08-30 12:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ROLE expectation for read commands with no slaves.

Browse Source 
This commit fixes #337.
This commit is contained in:
Daniele Alessandri
2016-05-25 15:56:33 +02:00
parent 9398a793a5
commit 0477499418
2 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Connection/Aggregate/SentinelReplication.php
+5 -5
View File
@@ -535,11 +535,11 @@ class SentinelReplication implements ReplicationInterface
{
$connection = $this->getConnectionInternal($command);
if (!$connection->isConnected() && ($this->slaves || $this->master)) {
$this->assertConnectionRole(
$connection,
$this->strategy->isReadOperation($command) ? 'slave' : 'master'
);
if (!$connection->isConnected()) {
// When we do not have any available slave in the pool we can expect
// read-only operations to hit the master server.
$expectedRole = $this->strategy->isReadOperation($command) && $this->slaves ? 'slave' : 'master';
$this->assertConnectionRole($connection, $expectedRole);
}
return $connection;
tests/Predis/Connection/Aggregate/SentinelReplicationTest.php
+43
View File
@@ -795,6 +795,49 @@ class SentinelReplicationTest extends PredisTestCase
$replication->getConnection(Command\RawCommand::create('del', 'key'));
}
/**
* @group disconnected
*/
public function testGetConnectionReturnsMasterForReadOnlyOperationsOnUnavailableSlaves()
{
$sentinel1 = $this->getMockSentinelConnection('tcp://127.0.0.1:5381?alias=sentinel1');
$sentinel1->expects($this->once())
->method('executeCommand')
->with($this->isRedisCommand(
'SENTINEL', array('slaves', 'svc')
))
->will($this->returnValue(
array(
array(
'name', '127.0.0.1:6382',
'ip', '127.0.0.1',
'port', '6382',
'runid', '1c0bf1291797fbc5608c07a17da394147dc62817',
'flags', 'slave,s_down,disconnected',
'master-host', '127.0.0.1',
'master-port', '6381',
),
)
));
$master = $this->getMockConnection('tcp://127.0.0.1:6381?alias=master');
$master->expects($this->once())
->method('isConnected')
->will($this->returnValue(false));
$master->expects($this->at(2))
->method('executeCommand')
->with($this->isRedisCommand('ROLE'))
->will($this->returnValue(array(
'master', '0', array(),
)));
$replication = $this->getReplicationConnection('svc', array($sentinel1));
$replication->add($master);
$replication->getConnection(Command\RawCommand::create('get', 'key'));
}
/**
* @group disconnected
*/