Check that the selected daemon is online for a transfer, delete the server from the old node when a transfer is successful

Author: matthewpi

app/Http/Controllers/Admin/Servers/ServerTransferController.php

@@ -12,6 +12,7 @@
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Repositories\Eloquent\LocationRepository;
+use Pterodactyl\Repositories\Wings\DaemonConfigurationRepository;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
 
 class ServerTransferController extends Controller
@@ -51,6 +52,11 @@ class ServerTransferController extends Controller
      */
     private $transferService;
 
+    /**
+     * @var \Pterodactyl\Repositories\Wings\DaemonConfigurationRepository
+     */
+    private $daemonConfigurationRepository;
+
     /**
      * ServerTransferController constructor.
      *
@@ -61,6 +67,7 @@ class ServerTransferController extends Controller
      * @param \Pterodactyl\Repositories\Eloquent\NodeRepository $nodeRepository
      * @param \Pterodactyl\Services\Servers\SuspensionService $suspensionService
      * @param \Pterodactyl\Services\Servers\TransferService $transferService
+     * @param \Pterodactyl\Repositories\Wings\DaemonConfigurationRepository $daemonConfigurationRepository
      */
     public function __construct(
         AlertsMessageBag $alert,
@@ -69,7 +76,8 @@ public function __construct(
         LocationRepository $locationRepository,
         NodeRepository $nodeRepository,
         SuspensionService $suspensionService,
-        TransferService $transferService
+        TransferService $transferService,
+        DaemonConfigurationRepository $daemonConfigurationRepository
     ) {
         $this->alert = $alert;
         $this->allocationRepository = $allocationRepository;
@@ -78,6 +86,7 @@ public function __construct(
         $this->nodeRepository = $nodeRepository;
         $this->suspensionService = $suspensionService;
         $this->transferService = $transferService;
+        $this->daemonConfigurationRepository = $daemonConfigurationRepository;
     }
 
     /**
@@ -104,6 +113,9 @@ public function transfer(Request $request, Server $server)
         // Check if the node is viable for the transfer.
         $node = $this->nodeRepository->getNodeWithResourceUsage($node_id);
         if ($node->isViable($server->memory, $server->disk)) {
+            // Check if the selected daemon is online.
+            $this->daemonConfigurationRepository->setNode($node)->getSystemInformation();
+
             // Suspend the server and request an archive to be created.
             $this->suspensionService->toggle($server, 'suspend');
 
@@ -123,7 +135,7 @@ public function transfer(Request $request, Server $server)
             // Add the allocations to the server so they cannot be automatically assigned while the transfer is in progress.
             $this->assignAllocationsToServer($server, $node_id, $allocation_id, $additional_allocations);
 
-            // Request an archive from the server's current daemon.
+            // Request an archive from the server's current daemon. (this also checks if the daemon is online)
             $this->transferService->requestArchive($server);
 
             $this->alert->success(trans('admin/server.alerts.transfer_started'))->flash();

app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php

@@ -6,15 +6,16 @@
 use Lcobucci\JWT\Builder;
 use Illuminate\Http\Request;
 use Lcobucci\JWT\Signer\Key;
+use Psr\Log\LoggerInterface;
 use Illuminate\Http\Response;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
 use Lcobucci\JWT\Signer\Hmac\Sha256;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Servers\SuspensionService;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Repositories\Wings\DaemonTransferRepository;
 use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
@@ -42,6 +43,11 @@ class ServerTransferController extends Controller
      */
     private $nodeRepository;
 
+    /**
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
+     */
+    private $daemonServerRepository;
+
     /**
      * @var \Pterodactyl\Repositories\Wings\DaemonTransferRepository
      */
@@ -57,33 +63,44 @@ class ServerTransferController extends Controller
      */
     private $suspensionService;
 
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $writer;
+
     /**
      * ServerTransferController constructor.
      *
      * @param \Illuminate\Database\ConnectionInterface $connection
      * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
      * @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository
      * @param \Pterodactyl\Repositories\Eloquent\NodeRepository $nodeRepository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
      * @param \Pterodactyl\Repositories\Wings\DaemonTransferRepository $daemonTransferRepository
      * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
      * @param \Pterodactyl\Services\Servers\SuspensionService $suspensionService
+     * @param \Psr\Log\LoggerInterface $writer
      */
     public function __construct(
         ConnectionInterface $connection,
         ServerRepository $repository,
         AllocationRepositoryInterface $allocationRepository,
         NodeRepository $nodeRepository,
+        DaemonServerRepository $daemonServerRepository,
         DaemonTransferRepository $daemonTransferRepository,
         ServerConfigurationStructureService $configurationStructureService,
-        SuspensionService $suspensionService
+        SuspensionService $suspensionService,
+        LoggerInterface $writer
     ) {
         $this->connection = $connection;
         $this->repository = $repository;
         $this->allocationRepository = $allocationRepository;
         $this->nodeRepository = $nodeRepository;
+        $this->daemonServerRepository = $daemonServerRepository;
         $this->daemonTransferRepository = $daemonTransferRepository;
         $this->configurationStructureService = $configurationStructureService;
         $this->suspensionService = $suspensionService;
+        $this->writer = $writer;
     }
 
     /**
@@ -162,15 +179,9 @@ public function failure(string $uuid)
         $allocationIds = json_decode($transfer->new_additional_allocations);
         array_push($allocationIds, $transfer->new_allocation);
 
-        // Begin a transaction.
-        $this->connection->beginTransaction();
-
         // Remove the new allocations.
         $this->allocationRepository->updateWhereIn('id', $allocationIds, ['server_id' => null]);
 
-        // Commit the transaction.
-        $this->connection->commit();
-
         // Unsuspend the server.
         $this->suspensionService->toggle($server, 'unsuspend');
 
@@ -190,8 +201,6 @@ public function success(string $uuid)
         $server = $this->repository->getByUuid($uuid);
         $transfer = $server->transfer;
 
-        // TODO: Notify old daemon about transfer and get it to remove server files.
-
         $allocationIds = json_decode($transfer->old_additional_allocations);
         array_push($allocationIds, $transfer->old_allocation);
 
@@ -213,11 +222,15 @@ public function success(string $uuid)
         // Commit the transaction.
         $this->connection->commit();
 
+        // Delete the server from the old node
+        try {
+            $this->daemonServerRepository->setServer($server)->delete();
+        } catch (DaemonConnectionException $exception) {
+            $this->writer->warning($exception);
+        }
+
         // Unsuspend the server
         $server->load('node');
-        Log::debug(json_encode($server));
-        Log::debug(json_encode($server->node_id));
-        Log::debug(json_encode($server->node));
         $this->suspensionService->toggle($server, $this->suspensionService::ACTION_UNSUSPEND);
 
         return JsonResponse::create([], Response::HTTP_NO_CONTENT);

app/Repositories/Eloquent/NodeRepository.php

@@ -183,7 +183,7 @@ public function getNodesForServerCreation(): Collection
     public function getNodeWithResourceUsage(int $node_id): Node
     {
         $instance = $this->getBuilder()
-            ->select(['nodes.id', 'nodes.memory', 'nodes.disk', 'nodes.memory_overallocate', 'nodes.disk_overallocate'])
+            ->select(['nodes.id', 'nodes.fqdn', 'nodes.scheme', 'nodes.daemonSecret', 'nodes.daemonListen', 'nodes.memory', 'nodes.disk', 'nodes.memory_overallocate', 'nodes.disk_overallocate'])
             ->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
             ->leftJoin('servers', 'servers.node_id', '=', 'nodes.id')
             ->where('nodes.id', $node_id);