Merge pull request #616 from laravel/revert-589-stats-pr

Revert "[3.0] Display worker CPU and memory utilization in supervisor list"
laravel · Jun 14, 2019 · 2b14e64 · 2b14e64
2 parents ccb4036 + fb9df5b
commit 2b14e64
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 42 deletions.
diff --git a/resources/js/screens/dashboard.vue b/resources/js/screens/dashboard.vue
@@ -300,8 +300,6 @@
                 <tr>
                     <th>Supervisor</th>
                     <th>Processes</th>
-                    <th>CPU Threads</th>
-                    <th>Memory</th>
                     <th>Queues</th>
                     <th class="text-right">Balancing</th>
                 </tr>
@@ -311,8 +309,6 @@
                 <tr v-for="supervisor in worker.supervisors">
                     <td>{{ superVisorDisplayName(supervisor.name, worker.name) }}</td>
                     <td>{{ countProcesses(supervisor.processes) }}</td>
-                    <td>{{ supervisor.cpu }}</td>
-                    <td>{{ supervisor.mem }}%</td>
                     <td>{{ supervisor.options.queue.replace(/,/g, ', ') }}</td>
                     <td class="text-right">
                         ({{ supervisor.options.balance.charAt(0).toUpperCase() + supervisor.options.balance.slice(1) }})

diff --git a/src/Repositories/RedisSupervisorRepository.php b/src/Repositories/RedisSupervisorRepository.php
@@ -71,7 +71,7 @@ public function get(array $names)
     {
         $records = $this->connection()->pipeline(function ($pipe) use ($names) {
             foreach ($names as $name) {
-                $pipe->hmget('supervisor:'.$name, ['name', 'master', 'pid', 'status', 'processes', 'options', 'cpu', 'mem']);
+                $pipe->hmget('supervisor:'.$name, ['name', 'master', 'pid', 'status', 'processes', 'options']);
             }
         });
 
@@ -85,8 +85,6 @@ public function get(array $names)
                 'status' => $record[3],
                 'processes' => json_decode($record[4], true),
                 'options' => json_decode($record[5], true),
-                'cpu' => $record[6],
-                'mem' => $record[7],
             ];
         })->filter()->all();
     }
@@ -116,7 +114,6 @@ public function update(Supervisor $supervisor)
         })->toJson();
 
         $this->connection()->pipeline(function ($pipe) use ($supervisor, $processes) {
-            $workerStats = $supervisor->workerStats();
             $pipe->hmset(
                 'supervisor:'.$supervisor->name, [
                     'name' => $supervisor->name,
@@ -125,8 +122,6 @@ public function update(Supervisor $supervisor)
                     'status' => $supervisor->working ? 'running' : 'paused',
                     'processes' => $processes,
                     'options' => $supervisor->options->toJson(),
-                    'cpu' => number_format($workerStats->sum('cpu'), 2),
-                    'mem' => round($workerStats->sum('mem')),
                 ]
             );
 

diff --git a/src/Supervisor.php b/src/Supervisor.php
@@ -406,16 +406,6 @@ public function totalProcessCount()
         return $this->processPools->sum->totalProcessCount();
     }
 
-    /**
-     * Get CPU and memory usage for the active workers by asking the OS.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function workerStats()
-    {
-        return app(SystemProcessCounter::class)->getWorkerStats($this->name);
-    }
-
     /**
      * Get the total active process count by asking the OS.
      *

diff --git a/src/SystemProcessCounter.php b/src/SystemProcessCounter.php
@@ -13,27 +13,6 @@ class SystemProcessCounter
      */
     public static $command = 'horizon:work';
 
-    /**
-     * Get CPU and memory usage for each Horizon workers for a given supervisor.
-     *
-     * @param  string  $name
-     * @return \Illuminate\Support\Collection
-     */
-    public function getWorkerStats($name)
-    {
-        $process = Process::fromShellCommandline('exec ps axo %cpu,%mem,command | grep '.static::$command.' | grep "supervisor='.$name.'" | grep -v "exec ps axo"', null, ['COLUMNS' => '2000']);
-
-        $process->run();
-
-        $rows = explode("\n", $process->getOutput());
-
-        return collect($rows)->filter()->map(function ($rows) {
-            $row = collect(explode(' ', $rows))->filter()->take(2);
-
-            return ['cpu' => $row->first() / 100, 'mem' => $row->last()];
-        });
-    }
-
     /**
      * Get the number of Horizon workers for a given supervisor.
      *
@@ -42,6 +21,10 @@ public function getWorkerStats($name)
      */
     public function get($name)
     {
-        return $this->getWorkerStats($name)->count();
+        $process = Process::fromShellCommandline('exec ps aux | grep '.static::$command, null, ['COLUMNS' => '2000']);
+
+        $process->run();
+
+        return substr_count($process->getOutput(), 'supervisor='.$name);
     }
 }