Allow clone now for DBs with existing PITR configs (#298)

harshitha-yb · web-flow · commit fd954a44ec0b · 2025-03-19T16:38:18.000+05:30
diff --git a/cmd/cluster/pitr-config/pitr_config_ops.go b/cmd/cluster/pitr-config/pitr_config_ops.go
@@ -427,12 +427,11 @@ var clonePitrConfigCmd = &cobra.Command{
 			}
 			cloneSpec.SetCloneNow(*ybmclient.NewDatabaseCloneNowSpec(namespaceId, cloneAs))
 		} else {
-			// We can only clone to PIT if a config is present for the {namespaceName, namespaceType}
 			if cmd.Flags().Lookup("clone-at-millis").Changed {
 				cloneAtMillis, _ := cmd.Flags().GetInt64("clone-at-millis")
 				cloneSpec.SetClonePointInTime(*ybmclient.NewDatabaseClonePITSpec(cloneAtMillis, pitrConfigId, cloneAs))
 			} else {
-				logrus.Fatalf("clone-at-millis parameter must be specified to clone via existing PITR config for %s namespace %s in cluster %s\n", namespaceType, namespaceName, ClusterName)
+				cloneSpec.SetCloneNow(*ybmclient.NewDatabaseCloneNowSpec(namespaceId, cloneAs))
 			}
 		}
 
diff --git a/cmd/pitr_config_test.go b/cmd/pitr_config_test.go
@@ -680,7 +680,7 @@ test_ycql_db   YCQL         6                          ACTIVE    123456
 			ysqlSession.Kill()
 		})
 
-		It("Should fail to clone YSQL namespace via pre existing PITR Config if clone time is not specified", func() {
+		It("Should successfully clone YSQL namespace to current time via specified pre existing PITR Config", func() {
 			os.Setenv("YBM_FF_PITR_CLONE", "true")
 			err := loadJson("./test/fixtures/namespaces.json", &responseNamespace)
 			Expect(err).ToNot(HaveOccurred())
@@ -699,12 +699,21 @@ test_ycql_db   YCQL         6                          ACTIVE    123456
 				),
 			)
 
+			restoreErr := loadJson("./test/fixtures/clone-now-ysql-db-existing-pitr.json", &responseClone)
+			Expect(restoreErr).ToNot(HaveOccurred())
+			server.AppendHandlers(
+				ghttp.CombineHandlers(
+					ghttp.VerifyRequest(http.MethodPost, "/api/public/v1/accounts/340af43a-8a7c-4659-9258-4876fd6a207b/projects/78d4459c-0f45-47a5-899a-45ddf43eba6e/clusters/5f80730f-ba3f-4f7e-8c01-f8fa4c90dad8/clone-database"),
+					ghttp.RespondWithJSONEncodedPtr(&statusCode, responseClone),
+				),
+			)
+
 			ysqlCmd := exec.Command(compiledCLIPath, "cluster", "pitr-config", "clone", "--cluster-name", "stunning-sole", "--namespace-name", "test_ysql_db", "--namespace-type", "YSQL", "--clone-as", "test_ysql_db_clone")
 			ysqlSession, ysqlErr := gexec.Start(ysqlCmd, GinkgoWriter, GinkgoWriter)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(ysqlErr).NotTo(HaveOccurred())
 			ysqlSession.Wait(2)
-			Expect(ysqlSession.Err).Should(gbytes.Say("clone-at-millis parameter must be specified to clone via existing PITR config for YSQL namespace test_ysql_db in cluster stunning-sole"))
+			Expect(ysqlSession.Out).Should(gbytes.Say("The YSQL namespace test_ysql_db in cluster stunning-sole is being cloned via PITR Configuration."))
 			ysqlSession.Kill()
 		})
 
diff --git a/cmd/test/fixtures/clone-now-ysql-database.json b/cmd/test/fixtures/clone-now-ysql-database.json
@@ -14,7 +14,7 @@
           "created_on": "2024-08-07T17:26:08.435Z"
         },
         "database_type": "YSQL",
-        "database_name": "test_ysql_db",
+        "database_name": "yugabyte",
         "id": "8e74ca8f-331b-4dec-89b0-4e59b81e905d",
         "state": "QUEUED"
       }
diff --git a/cmd/test/fixtures/clone-now-ysql-db-existing-pitr.json b/cmd/test/fixtures/clone-now-ysql-db-existing-pitr.json
@@ -0,0 +1,22 @@
+{
+    "data": {
+      "spec": {
+        "clone_now": {
+            "database_id": "00004002-0000-3000-8000-000000000000",
+            "clone_as": "test_ysql_db_clone"
+        },
+        "clone_point_in_time": null
+      },
+      "info": {
+        "cluster_id": "5f80730f-ba3f-4f7e-8c01-f8fa4c90dad8",
+        "metadata": {
+          "updated_on": "2024-08-07T17:26:08.435Z",
+          "created_on": "2024-08-07T17:26:08.435Z"
+        },
+        "database_type": "YSQL",
+        "database_name": "test_ysql_db",
+        "id": "8e74ca8f-331b-4dec-89b0-4e59b81e905d",
+        "state": "QUEUED"
+      }
+    }
+  }
diff --git a/go.mod b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/viper v1.17.0
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
-	github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20250201211410-51dcbc34e9a3
+	github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20250314120043-8b25464e38ba
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/mod v0.20.0
 	golang.org/x/term v0.25.0
diff --git a/go.sum b/go.sum
@@ -282,8 +282,8 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
-github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20250201211410-51dcbc34e9a3 h1:K+x7BoZbnpdq/3IXg8yOU5KoExlU6+1WTYhuHIlk2vM=
-github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20250201211410-51dcbc34e9a3/go.mod h1:5vW0xIzIZw+1djkiWKx0qqNmqbRBSf4mjc4qw8lIMik=
+github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20250314120043-8b25464e38ba h1:kveckCqCVUiC1J4BL9dfCNbWd51z2Eas2JTf4WBYAH8=
+github.com/yugabyte/yugabytedb-managed-go-client-internal v0.0.0-20250314120043-8b25464e38ba/go.mod h1:5vW0xIzIZw+1djkiWKx0qqNmqbRBSf4mjc4qw8lIMik=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

Original file line number	Diff line number	Diff line change
`@@ -427,12 +427,11 @@ var clonePitrConfigCmd = &cobra.Command{`
`427`	`427`	`}`
`428`	`428`	`cloneSpec.SetCloneNow(*ybmclient.NewDatabaseCloneNowSpec(namespaceId, cloneAs))`
`429`	`429`	`} else {`
`430`		`- // We can only clone to PIT if a config is present for the {namespaceName, namespaceType}`
`431`	`430`	`if cmd.Flags().Lookup("clone-at-millis").Changed {`
`432`	`431`	`cloneAtMillis, _ := cmd.Flags().GetInt64("clone-at-millis")`
`433`	`432`	`cloneSpec.SetClonePointInTime(*ybmclient.NewDatabaseClonePITSpec(cloneAtMillis, pitrConfigId, cloneAs))`
`434`	`433`	`} else {`
`435`		`- logrus.Fatalf("clone-at-millis parameter must be specified to clone via existing PITR config for %s namespace %s in cluster %s\n", namespaceType, namespaceName, ClusterName)`
	`434`	`+ cloneSpec.SetCloneNow(*ybmclient.NewDatabaseCloneNowSpec(namespaceId, cloneAs))`
`436`	`435`	`}`
`437`	`436`	`}`
`438`	`437`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"created_on": "2024-08-07T17:26:08.435Z"`
`15`	`15`	`},`
`16`	`16`	`"database_type": "YSQL",`
`17`		`- "database_name": "test_ysql_db",`
	`17`	`+ "database_name": "yugabyte",`
`18`	`18`	`"id": "8e74ca8f-331b-4dec-89b0-4e59b81e905d",`
`19`	`19`	`"state": "QUEUED"`
`20`	`20`	`}`