add pool init

swoft-cloud · Sep 13, 2019 · a367173 · a367173
1 parent c2e87f2
commit a367173
Show file tree

Hide file tree

Showing 8 changed files with 149 additions and 11 deletions.
diff --git a/src/connection-pool/src/AbstractPool.php b/src/connection-pool/src/AbstractPool.php
@@ -7,6 +7,7 @@
 use Swoft\Connection\Pool\Contract\ConnectionInterface;
 use Swoft\Connection\Pool\Contract\PoolInterface;
 use Swoft\Connection\Pool\Exception\ConnectionPoolException;
+use Swoft\Log\Helper\CLog;
 use Swoole\Coroutine\Channel;
 use Throwable;
 
@@ -59,6 +60,11 @@ abstract class AbstractPool implements PoolInterface
      */
     protected $maxCloseTime = 3;
 
+    /**
+     * @var bool
+     */
+    protected $init = false;
+
     /**
      * @var Channel
      */
@@ -83,6 +89,27 @@ abstract class AbstractPool implements PoolInterface
      */
     protected $connectionId = 0;
 
+    /**
+     * Initialize pool
+     *
+     * @throws ConnectionPoolException
+     */
+    public function initPool(): void
+    {
+        if (!$this->init) {
+//            return;
+        }
+
+        // Enable initialize pool
+        for ($i = 0; $i < $this->minActive; $i++) {
+            $connection = $this->getConnection();
+            $connection->setRelease(true);
+            $connection->release();
+        }
+
+        CLog::debug('Initialize ' . static::class . ' pool size=' . $this->count);
+    }
+
     /**
      * @return int
      */
@@ -189,7 +216,7 @@ private function getConnectionByChannel(): ConnectionInterface
             );
         }
 
-        /* @var ConnectionInterface $connection*/
+        /* @var ConnectionInterface $connection */
         // Sleep coroutine and resume coroutine after `maxWaitTime`, Return false is waiting timeout
         $connection = $this->channel->pop($this->maxWaitTime);
         if ($connection === false) {
@@ -238,7 +265,7 @@ private function create(): ConnectionInterface
      */
     private function popByChannel(): ?ConnectionInterface
     {
-        $time       = time();
+        $time = time();
 
         while (!$this->channel->isEmpty()) {
             /* @var ConnectionInterface $connection */

diff --git a/src/connection-pool/src/Contract/PoolInterface.php b/src/connection-pool/src/Contract/PoolInterface.php
@@ -10,6 +10,11 @@
  */
 interface PoolInterface
 {
+    /**
+     * Initialize pool
+     */
+    public function initPool(): void;
+
     /**
      * Create connection
      *

diff --git a/src/db/src/AutoLoader.php b/src/db/src/AutoLoader.php
@@ -19,8 +19,6 @@ class AutoLoader extends SwoftComponent
 {
     /**
      * @return array
-     * @throws ContainerException
-     * @throws ReflectionException
      */
     public function beans(): array
     {
@@ -29,13 +27,13 @@ public function beans(): array
                 'class'  => Database::class,
                 'dsn'    => 'mysql:dbname=dbname;host=127.0.0.1',
                 'config' => [
-                     // fetch array
+                    // fetch array
                     'fetchMode' => PDO::FETCH_ASSOC,
                 ],
             ],
             'db.pool' => [
                 'class'    => Pool::class,
-                'database' => bean('db')
+                'database' => bean('db'),
             ]
         ];
     }

diff --git a/src/db/src/Listener/WorkerStartListener.php b/src/db/src/Listener/WorkerStartListener.php
@@ -0,0 +1,38 @@
+<?php declare(strict_types=1);
+
+
+namespace Swoft\Db\Listener;
+
+
+use Swoft\Bean\BeanFactory;
+use Swoft\Connection\Pool\Exception\ConnectionPoolException;
+use Swoft\Db\Pool;
+use Swoft\Event\Annotation\Mapping\Listener;
+use Swoft\Event\EventHandlerInterface;
+use Swoft\Event\EventInterface;
+use Swoft\Server\ServerEvent;
+
+/**
+ * Class WorkerStartListener
+ *
+ * @since 2.0
+ *
+ * @Listener(event=ServerEvent::WORK_PROCESS_START)
+ */
+class WorkerStartListener implements EventHandlerInterface
+{
+    /**
+     * @param EventInterface $event
+     *
+     * @throws ConnectionPoolException
+     */
+    public function handle(EventInterface $event): void
+    {
+        $pools = BeanFactory::getBeans(Pool::class);
+
+        /* @var Pool $pool */
+        foreach ($pools as $pool) {
+            $pool->initPool();
+        }
+    }
+}
diff --git a/src/redis/src/AutoLoader.php b/src/redis/src/AutoLoader.php
@@ -37,8 +37,6 @@ public function metadata(): array
 
     /**
      * @return array
-     * @throws ReflectionException
-     * @throws ContainerException
      */
     public function beans(): array
     {
@@ -51,7 +49,7 @@ public function beans(): array
             ],
             'redis.pool' => [
                 'class'   => Pool::class,
-                'redisDb' => bean('redis')
+                'redisDb' => bean('redis'),
             ]
         ];
     }

diff --git a/src/redis/src/Listener/WorkerStartListener.php b/src/redis/src/Listener/WorkerStartListener.php
@@ -0,0 +1,37 @@
+<?php declare(strict_types=1);
+
+
+namespace Swoft\Redis\Listener;
+
+use Swoft\Bean\BeanFactory;
+use Swoft\Connection\Pool\Exception\ConnectionPoolException;
+use Swoft\Event\Annotation\Mapping\Listener;
+use Swoft\Event\EventHandlerInterface;
+use Swoft\Event\EventInterface;
+use Swoft\Redis\Pool;
+use Swoft\Server\ServerEvent;
+
+/**
+ * Class WorkerStartListener
+ *
+ * @since 2.0
+ *
+ * @Listener(event=ServerEvent::WORK_PROCESS_START)
+ */
+class WorkerStartListener implements EventHandlerInterface
+{
+    /**
+     * @param EventInterface $event
+     *
+     * @throws ConnectionPoolException
+     */
+    public function handle(EventInterface $event): void
+    {
+        $pools = BeanFactory::getBeans(Pool::class);
+
+        /* @var Pool $pool */
+        foreach ($pools as $pool) {
+            $pool->initPool();
+        }
+    }
+}
diff --git a/src/rpc-client/src/AutoLoader.php b/src/rpc-client/src/AutoLoader.php
@@ -37,8 +37,6 @@ public function metadata(): array
 
     /**
      * @return array
-     * @throws ReflectionException
-     * @throws ContainerException
      */
     public function beans(): array
     {

diff --git a/src/rpc-client/src/Listener/WorkerStartListener.php b/src/rpc-client/src/Listener/WorkerStartListener.php
@@ -0,0 +1,37 @@
+<?php declare(strict_types=1);
+
+
+namespace Swoft\Rpc\Client\Listener;
+
+use Swoft\Bean\BeanFactory;
+use Swoft\Connection\Pool\Exception\ConnectionPoolException;
+use Swoft\Event\Annotation\Mapping\Listener;
+use Swoft\Event\EventHandlerInterface;
+use Swoft\Event\EventInterface;
+use Swoft\Rpc\Client\Pool;
+use Swoft\Server\ServerEvent;
+
+/**
+ * Class WorkerStartListener
+ *
+ * @since 2.0
+ *
+ * @Listener(event=ServerEvent::WORK_PROCESS_START)
+ */
+class WorkerStartListener implements EventHandlerInterface
+{
+    /**
+     * @param EventInterface $event
+     *
+     * @throws ConnectionPoolException
+     */
+    public function handle(EventInterface $event): void
+    {
+        $pools = BeanFactory::getBeans(Pool::class);
+
+        /* @var Pool $pool */
+        foreach ($pools as $pool) {
+            $pool->initPool();
+        }
+    }
+}