Store S3 upload_id in the database for backups
This commit is contained in:
parent
9b01734752
commit
951d92b143
4 changed files with 43 additions and 3 deletions
|
@ -47,6 +47,7 @@ class BackupRemoteUploadController extends Controller
|
||||||
* @return \Illuminate\Http\JsonResponse
|
* @return \Illuminate\Http\JsonResponse
|
||||||
*
|
*
|
||||||
* @throws \Exception
|
* @throws \Exception
|
||||||
|
* @throws \Throwable
|
||||||
* @throws \Illuminate\Database\Eloquent\ModelNotFoundException
|
* @throws \Illuminate\Database\Eloquent\ModelNotFoundException
|
||||||
*/
|
*/
|
||||||
public function __invoke(Request $request, string $backup)
|
public function __invoke(Request $request, string $backup)
|
||||||
|
@ -101,8 +102,12 @@ class BackupRemoteUploadController extends Controller
|
||||||
)->getUri()->__toString();
|
)->getUri()->__toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
return new JsonResponse([
|
// Set the upload_id on the backup in the database.
|
||||||
|
$backup->forceFill([
|
||||||
'upload_id' => $params['UploadId'],
|
'upload_id' => $params['UploadId'],
|
||||||
|
])->saveOrFail();
|
||||||
|
|
||||||
|
return new JsonResponse([
|
||||||
'parts' => $parts,
|
'parts' => $parts,
|
||||||
'part_size' => self::PART_SIZE,
|
'part_size' => self::PART_SIZE,
|
||||||
]);
|
]);
|
||||||
|
|
|
@ -78,7 +78,7 @@ class BackupStatusController extends Controller
|
||||||
$params = [
|
$params = [
|
||||||
'Bucket' => $adapter->getBucket(),
|
'Bucket' => $adapter->getBucket(),
|
||||||
'Key' => sprintf('%s/%s.tar.gz', $backup->server->uuid, $backup->uuid),
|
'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.
|
// If the backup was not successful, send an AbortMultipartUpload request.
|
||||||
|
|
|
@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
|
||||||
* @property string $disk
|
* @property string $disk
|
||||||
* @property string|null $checksum
|
* @property string|null $checksum
|
||||||
* @property int $bytes
|
* @property int $bytes
|
||||||
|
* @property string|null $upload_id
|
||||||
* @property \Carbon\CarbonImmutable|null $completed_at
|
* @property \Carbon\CarbonImmutable|null $completed_at
|
||||||
* @property \Carbon\CarbonImmutable $created_at
|
* @property \Carbon\CarbonImmutable $created_at
|
||||||
* @property \Carbon\CarbonImmutable $updated_at
|
* @property \Carbon\CarbonImmutable $updated_at
|
||||||
|
@ -46,8 +47,8 @@ class Backup extends Model
|
||||||
protected $casts = [
|
protected $casts = [
|
||||||
'id' => 'int',
|
'id' => 'int',
|
||||||
'is_successful' => 'bool',
|
'is_successful' => 'bool',
|
||||||
'bytes' => 'int',
|
|
||||||
'ignored_files' => 'array',
|
'ignored_files' => 'array',
|
||||||
|
'bytes' => 'int',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -64,6 +65,7 @@ class Backup extends Model
|
||||||
'is_successful' => true,
|
'is_successful' => true,
|
||||||
'checksum' => null,
|
'checksum' => null,
|
||||||
'bytes' => 0,
|
'bytes' => 0,
|
||||||
|
'upload_id' => null,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -78,6 +80,7 @@ class Backup extends Model
|
||||||
'disk' => 'required|string',
|
'disk' => 'required|string',
|
||||||
'checksum' => 'nullable|string',
|
'checksum' => 'nullable|string',
|
||||||
'bytes' => 'numeric',
|
'bytes' => 'numeric',
|
||||||
|
'upload_id' => 'nullable|uuid',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -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');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue