Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-23 01:22:30 +01:00
Code Issues Releases Wiki Activity

Merge pull request #2914 from pterodactyl/fix/s3-backups

Browse Source 
Store S3 upload_id in the database for backups
This commit is contained in:
Dane Everitt 2020-12-26 11:34:31 -08:00 committed by GitHub
commit 1ba0f4fb16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php
View File

@ -47,6 +47,7 @@ class BackupRemoteUploadController extends Controller
* @return \Illuminate\Http\JsonResponse
*
* @throws \Exception
* @throws \Throwable
* @throws \Illuminate\Database\Eloquent\ModelNotFoundException
*/
public function __invoke(Request $request, string $backup)
@ -101,8 +102,12 @@ class BackupRemoteUploadController extends Controller
)->getUri()->__toString();
}
return new JsonResponse([
// Set the upload_id on the backup in the database.
$backup->forceFill([
'upload_id' => $params['UploadId'],
])->saveOrFail();
return new JsonResponse([
'parts' => $parts,
'part_size' => self::PART_SIZE,
]);

2
app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php
View File

@ -78,7 +78,7 @@ class BackupStatusController extends Controller
$params = [
'Bucket' => $adapter->getBucket(),
'Key' => sprintf('%s/%s.tar.gz', $backup->server->uuid, $backup->uuid),
'UploadId' => $request->input('upload_id'),
'UploadId' => $backup->upload_id,
];
// If the backup was not successful, send an AbortMultipartUpload request.

5
app/Models/Backup.php
View File

@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property string $disk
* @property string|null $checksum
* @property int $bytes
* @property string|null $upload_id
* @property \Carbon\CarbonImmutable|null $completed_at
* @property \Carbon\CarbonImmutable $created_at
* @property \Carbon\CarbonImmutable $updated_at
@ -46,8 +47,8 @@ class Backup extends Model
protected $casts = [
'id' => 'int',
'is_successful' => 'bool',
'bytes' => 'int',
'ignored_files' => 'array',
'bytes' => 'int',
];
/**
@ -64,6 +65,7 @@ class Backup extends Model
'is_successful' => true,
'checksum' => null,
'bytes' => 0,
'upload_id' => null,
];
/**
@ -78,6 +80,7 @@ class Backup extends Model
'disk' => 'required|string',
'checksum' => 'nullable|string',
'bytes' => 'numeric',
'upload_id' => 'nullable|uuid',
];
/**

32
database/migrations/2020_12_26_184914_add_upload_id_column_to_backups_table.php Normal file
View File

@ -0,0 +1,32 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddUploadIdColumnToBackupsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('backups', function (Blueprint $table) {
$table->char('upload_id', 36)->nullable()->after('bytes');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('backups', function (Blueprint $table) {
$table->dropColumn('upload_id');
});
}
}