[CN-438] Use Agent asynchronous upload API

hazelcast · Jul 21, 2022 · 1093a5b · 1093a5b
1 parent 75effe0
commit 1093a5b
Show file tree

Hide file tree

Showing 13 changed files with 598 additions and 328 deletions.
diff --git a/api/v1alpha1/hotbackup_types.go b/api/v1alpha1/hotbackup_types.go
@@ -11,17 +11,16 @@ const (
 	HotBackupInProgress HotBackupState = "InProgress"
 	HotBackupFailure    HotBackupState = "Failure"
 	HotBackupSuccess    HotBackupState = "Success"
-	HotBackupWaiting    HotBackupState = "Waiting"
 )
 
 func (s HotBackupState) IsFinished() bool {
-	return s == HotBackupFailure || s == HotBackupSuccess || s == HotBackupWaiting
+	return s == HotBackupFailure || s == HotBackupSuccess
 }
 
 // IsRunning returns true if the HotBackup is scheduled to run or is running but not yet finished.
 // Returns false if the HotBackup is not yet scheduled to run or finished it execution including the failure state.
 func (s HotBackupState) IsRunning() bool {
-	return !s.IsFinished() && s != ""
+	return s == HotBackupInProgress || s == HotBackupPending
 }
 
 // HotBackupStatus defines the observed state of HotBackup

diff --git a/config/samples/_v1alpha1_hotbackup_agent.yaml b/config/samples/_v1alpha1_hotbackup_agent.yaml
@@ -4,11 +4,11 @@ metadata:
   name: hot-backup
 spec:
   hazelcastResourceName: hazelcast
-  bucketURI: "s3://operator-backup"
+  bucketURI: "s3://operator-e2e-external-backup"
   secret: "br-secret-s3"
 
 #  bucketURI: "gs://operator-agent-backup"
 #  secret: "br-secret-gcp"
 
 #  bucketURI: "azblob://backup"
-#  secret: "br-secret-az"
+#  secret: "br-secret-az"
diff --git a/controllers/hazelcast/br_agent_rest_client.go b/controllers/hazelcast/br_agent_rest_client.go