Skip to content

Commit f0674e1

Browse files
authored
Fix parallel running: redis to kv storage (#27)
1 parent 98da290 commit f0674e1

File tree

3 files changed

+14
-24
lines changed

3 files changed

+14
-24
lines changed

src/DB/Managers/ParallelRunningStateManager.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,26 @@
44

55
namespace Abrouter\Client\DB\Managers;
66

7+
use Abrouter\Client\Config\Accessors\KvStorageConfigAccessor;
78
use Abrouter\Client\DB\Dictionary\ParallelRunningDictionary;
8-
use Abrouter\Client\DB\RedisConnection;
99
use Abrouter\Client\DB\Repositories\ParallelRunningStateCachedRepository;
1010

1111
class ParallelRunningStateManager
1212
{
13-
private RedisConnection $redisConnection;
14-
1513
private ParallelRunningStateCachedRepository $parallelRunningStateCachedRepository;
14+
private KvStorageConfigAccessor $kvStorageConfigAccessor;
1615

1716
public function __construct(
18-
RedisConnection $redisConnection,
17+
KvStorageConfigAccessor $kvStorageConfigAccessor,
1918
ParallelRunningStateCachedRepository $parallelRunningStateCachedRepository
2019
) {
21-
$this->redisConnection = $redisConnection;
20+
$this->kvStorageConfigAccessor = $kvStorageConfigAccessor;
2221
$this->parallelRunningStateCachedRepository = $parallelRunningStateCachedRepository;
2322
}
2423

2524
public function setReadyToServe()
2625
{
27-
$this->redisConnection->getConnection()->set(
26+
$this->kvStorageConfigAccessor->getKvStorage()->put(
2827
ParallelRunningDictionary::IS_RUNNING_KEY,
2928
ParallelRunningDictionary::IS_RUNNING_VALUE_TRUE
3029
);
@@ -33,7 +32,7 @@ public function setReadyToServe()
3332

3433
public function setStopServing()
3534
{
36-
$this->redisConnection->getConnection()->set(
35+
$this->kvStorageConfigAccessor->getKvStorage()->put(
3736
ParallelRunningDictionary::IS_RUNNING_KEY,
3837
ParallelRunningDictionary::IS_RUNNING_VALUE_STOPPED
3938
);
@@ -42,7 +41,7 @@ public function setStopServing()
4241

4342
public function setInitialized()
4443
{
45-
$this->redisConnection->getConnection()->set(
44+
$this->kvStorageConfigAccessor->getKvStorage()->put(
4645
ParallelRunningDictionary::IS_INITIAZLIED_KEY,
4746
ParallelRunningDictionary::IS_INITIAZLIED_TRUE_VALUE
4847
);

src/DB/Repositories/ParallelRunningStateRepository.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
44

55
namespace Abrouter\Client\DB\Repositories;
66

7+
use Abrouter\Client\Config\Accessors\KvStorageConfigAccessor;
78
use Abrouter\Client\DB\Dictionary\ParallelRunningDictionary;
8-
use Abrouter\Client\DB\RedisConnection;
99

1010
class ParallelRunningStateRepository
1111
{
12-
private RedisConnection $redisConnection;
12+
private KvStorageConfigAccessor $kvStorage;
1313

14-
public function __construct(RedisConnection $redisConnection)
14+
public function __construct(KvStorageConfigAccessor $kvStorageConfigAccessor)
1515
{
16-
$this->redisConnection = $redisConnection;
16+
$this->kvStorage = $kvStorageConfigAccessor;
1717
}
1818

1919
public function isInitialized(): bool
2020
{
21-
$value = $this->redisConnection->getConnection()->get(ParallelRunningDictionary::IS_INITIAZLIED_KEY);
21+
$value = $this->kvStorage->getKvStorage()->get(ParallelRunningDictionary::IS_INITIAZLIED_KEY);
2222
return $value === ParallelRunningDictionary::IS_INITIAZLIED_TRUE_VALUE;
2323
}
2424

2525
public function isReady(): bool
2626
{
27-
$value = $this->redisConnection->getConnection()->get(ParallelRunningDictionary::IS_RUNNING_KEY);
27+
$value = $this->kvStorage->getKvStorage()->get(ParallelRunningDictionary::IS_RUNNING_KEY);
2828
return $value === ParallelRunningDictionary::IS_RUNNING_VALUE_TRUE;
2929
}
3030
}

src/Services/ExperimentsParallelRun/ParallelRunInitializer.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Abrouter\Client\Services\ExperimentsParallelRun;
66

77
use Abrouter\Client\DB\Managers\ParallelRunningStateManager;
8-
use Abrouter\Client\DB\RedisConnection;
98
use Abrouter\Client\DB\RelatedUsersStore;
109
use Abrouter\Client\DB\Repositories\ParallelRunningStateCachedRepository;
1110

@@ -15,24 +14,16 @@ class ParallelRunInitializer
1514

1615
private ParallelRunningStateManager $parallelRunningStateManager;
1716

18-
private RedisConnection $redisConnection;
19-
2017
public function __construct(
2118
ParallelRunningStateCachedRepository $parallelRunningStateCachedRepository,
22-
ParallelRunningStateManager $parallelRunningStateManager,
23-
RedisConnection $redisConnection
19+
ParallelRunningStateManager $parallelRunningStateManager
2420
) {
2521
$this->parallelRunningStateCachedRepository = $parallelRunningStateCachedRepository;
2622
$this->parallelRunningStateManager = $parallelRunningStateManager;
27-
$this->redisConnection = $redisConnection;
2823
}
2924

3025
public function initializeIfNot(): bool
3126
{
32-
if (!$this->redisConnection->isReady()) {
33-
return false;
34-
}
35-
3627
//if parallel running ready to serve
3728
if ($this->parallelRunningStateCachedRepository->isReady()) {
3829
return true;

0 commit comments

Comments
 (0)