Refactor delay

Author: Илья

slo-workload/src/Commands/RunCommand.php

@@ -185,6 +185,7 @@ protected function readJob(string $endpoint, string $path, $tableName, int $init
         $dataGenerator = new DataGenerator($initialDataCount);
         $query = sprintf(Defaults::READ_QUERY, $tableName);
         $table = $ydb->table();
+        $i = 0;
 
         while (microtime(true) <= $startTime + $time) {
             $begin = microtime(true);
@@ -213,7 +214,8 @@ protected function readJob(string $endpoint, string $path, $tableName, int $init
                 $table->getLogger()->error($e->getMessage());
                 Utils::metricFail("read", $this->queueId, $attemps, get_class($e), $this->getLatency($begin));
             } finally {
-                $delay = $begin * 1e6 + 1e6 / Defaults::RPS_PER_WRITE_FORK - microtime(true) * 1e6;
+                $i++;
+                $delay = $this->getDelay($startTime, Defaults::RPS_PER_READ_FORK, $i);
                 usleep($delay > 0 ? $delay : 1);
             }
         }
@@ -225,6 +227,7 @@ protected function writeJob(string $endpoint, string $path, $tableName, int $ini
         $dataGenerator = new DataGenerator($initialDataCount);
         $query = sprintf(Defaults::WRITE_QUERY, $tableName);
         $table = $ydb->table();
+        $i=0;
         while (microtime(true) <= $startTime + $time) {
             $begin = microtime(true);
             Utils::metricsStart("write", $this->queueId);
@@ -246,7 +249,8 @@ protected function writeJob(string $endpoint, string $path, $tableName, int $ini
                 $table->getLogger()->error($e->getMessage());
                 Utils::metricFail("write", $this->queueId, $attemps, get_class($e), $this->getLatency($begin));
             } finally {
-                $delay = $begin * 1e6 + 1e6 / Defaults::RPS_PER_READ_FORK - microtime(true)* 1e6;
+                $i++;
+                $delay = $this->getDelay($startTime, Defaults::RPS_PER_WRITE_FORK, $i);
                 usleep($delay > 0 ? $delay : 1);
             }
         }
@@ -323,6 +327,16 @@ protected function metricsJob(int $reportPeriod, float $startTime, int $time, st
         }
     }
 
+    protected function getLatency($begin)
+    {
+        return (microtime(true) - $begin) * 1000;
+    }
+
+    protected function getDelay(float $startTime, int $rps, int $i)
+    {
+        return $startTime * 1000000 + $i * 1000000 / $rps - microtime(true) * 1000000;
+    }
+
     protected $errors = [
         "GRPC_CANCELLED",
         "GRPC_UNKNOWN",
@@ -362,9 +376,4 @@ protected function metricsJob(int $reportPeriod, float $startTime, int $time, st
         "YDB_SESSION_BUSY"
     ];
 
-    protected function getLatency($begin)
-    {
-        return (microtime(true) - $begin) * 1000;
-    }
-
 }