RavenDB-1716 StartRestore/StartBackup location in Client API

ravendb · Feb 14, 2014 · 8489881 · 8489881
1 parent 4058b37
commit 8489881
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 64 deletions.
diff --git a/Raven.Client.Embedded/EmbeddedAsyncServerClient.cs b/Raven.Client.Embedded/EmbeddedAsyncServerClient.cs
@@ -304,7 +304,7 @@ public Task<BuildNumber> GetBuildNumberAsync()
 			return new CompletedTask<BuildNumber>(databaseCommands.GetBuildNumber());			
 		}
 
-		public Task StartBackupAsync(string backupLocation, DatabaseDocument databaseDocument)
+		public Task StartBackupAsync(string backupLocation, DatabaseDocument databaseDocument, string databaseName)
 		{
 			// No sync equivalent on IDatabaseCommands.
 			throw new NotSupportedException();

diff --git a/Raven.Client.Lightweight/Connection/AdminRequestCreator.cs b/Raven.Client.Lightweight/Connection/AdminRequestCreator.cs
@@ -67,15 +67,20 @@ public HttpJsonRequest AdminStats()
 			return createRequestForSystemDatabase("/admin/stats", "GET");
 		}
 
-		public HttpJsonRequest StartBackup(string backupLocation, DatabaseDocument databaseDocument, out  RavenJObject backupSettings)
+		public HttpJsonRequest StartBackup(string backupLocation, DatabaseDocument databaseDocument, string databaseName, out  RavenJObject backupSettings)
 		{
 			backupSettings = new RavenJObject
 			{
 				{"BackupLocation", backupLocation},
 				{"DatabaseDocument", RavenJObject.FromObject(databaseDocument)}
 			};
 
-			return createRequest("/admin/backup", "POST");
+            if (databaseName == Constants.SystemDatabase)
+            {
+                return createRequestForSystemDatabase("/admin/backup", "POST");
+            }
+            return createRequestForSystemDatabase("/databases/" + databaseName + "/admin/backup", "POST");
+
 		}
 
 		public HttpJsonRequest StartRestore(string restoreLocation, string databaseLocation, string databaseName, bool defrag, out RavenJObject restoreSettings)

diff --git a/Raven.Client.Lightweight/Connection/AdminServerClient.cs b/Raven.Client.Lightweight/Connection/AdminServerClient.cs
@@ -49,9 +49,9 @@ public void StartIndexing()
 			asyncAdminServerClient.StartIndexingAsync().WaitUnwrap();
 		}
 
-		public void StartBackup(string backupLocation, DatabaseDocument databaseDocument)
+		public void StartBackup(string backupLocation, DatabaseDocument databaseDocument, string databaseName)
 		{
-			asyncAdminServerClient.StartBackupAsync(backupLocation, databaseDocument).WaitUnwrap();
+			asyncAdminServerClient.StartBackupAsync(backupLocation, databaseDocument, databaseName).WaitUnwrap();
 		}
 
 		public void StartRestore(string restoreLocation, string databaseLocation, string databaseName = null, bool defrag = false)

diff --git a/Raven.Client.Lightweight/Connection/Async/AsyncAdminServerClient.cs b/Raven.Client.Lightweight/Connection/Async/AsyncAdminServerClient.cs
@@ -59,10 +59,10 @@ public async Task<AdminStatistics> GetStatisticsAsync()
 			return json.Deserialize<AdminStatistics>(innerAsyncServerClient.convention);
 		}
 
-		public Task StartBackupAsync(string backupLocation, DatabaseDocument databaseDocument)
+		public Task StartBackupAsync(string backupLocation, DatabaseDocument databaseDocument, string databaseName)
 		{
 			RavenJObject backupSettings;
-			var request = adminRequest.StartBackup(backupLocation, databaseDocument, out backupSettings);
+			var request = adminRequest.StartBackup(backupLocation, databaseDocument, databaseName, out backupSettings);
 
 			return request.WriteAsync(backupSettings.ToString(Formatting.None));
 		}

diff --git a/Raven.Client.Lightweight/Connection/Async/AsyncServerClient.cs b/Raven.Client.Lightweight/Connection/Async/AsyncServerClient.cs
@@ -1132,9 +1132,9 @@ public Task StartIndexingAsync()
 			});
 		}
 
-		public Task StartBackupAsync(string backupLocation, DatabaseDocument databaseDocument)
+		public Task StartBackupAsync(string backupLocation, DatabaseDocument databaseDocument, string databaseName)
 		{
-			var request = jsonRequestFactory.CreateHttpJsonRequest(new CreateHttpJsonRequestParams(this, (url + "/admin/backup").NoCache(), "POST", credentialsThatShouldBeUsedOnlyInOperationsWithoutReplication, convention));
+			var request = jsonRequestFactory.CreateHttpJsonRequest(new CreateHttpJsonRequestParams(this, (MultiDatabase.GetDatabaseUrl(url, databaseName) + "/admin/backup").NoCache(), "POST", credentialsThatShouldBeUsedOnlyInOperationsWithoutReplication, convention));
 			request.AddOperationHeaders(OperationsHeaders);
 			return request.WriteAsync(new RavenJObject
 			{

diff --git a/Raven.Client.Lightweight/Connection/Async/IAsyncDatabaseCommands.cs b/Raven.Client.Lightweight/Connection/Async/IAsyncDatabaseCommands.cs
@@ -492,6 +492,11 @@ public interface IAsyncGlobalAdminDatabaseCommands
         /// Begins an async restore operation
         /// </summary>
         Task StartRestoreAsync(string restoreLocation, string databaseLocation, string databaseName = null, bool defrag = false);
+
+        /// <summary>
+        /// Begins an async backup operation
+        /// </summary>
+        Task StartBackupAsync(string backupLocation, DatabaseDocument databaseDocument, string databaseName);
 	}
 
 	public interface IAsyncAdminDatabaseCommands
@@ -506,11 +511,6 @@ public interface IAsyncAdminDatabaseCommands
 		/// </summary>
 		Task StartIndexingAsync();
 
-		/// <summary>
-		/// Begins an async backup operation
-		/// </summary>
-		Task StartBackupAsync(string backupLocation, DatabaseDocument databaseDocument);
-
 		/// <summary>
 		/// Get the indexing status
 		/// </summary>

diff --git a/Raven.Client.Lightweight/Connection/IDatabaseCommands.cs b/Raven.Client.Lightweight/Connection/IDatabaseCommands.cs
@@ -509,6 +509,11 @@ public interface IGlobalAdminDatabaseCommands
         /// </summary>
         void StartRestore(string restoreLocation, string databaseLocation, string databaseName = null, bool defrag = false);
 
+        /// <summary>
+        /// Begins a backup operation
+        /// </summary>
+        void StartBackup(string backupLocation, DatabaseDocument databaseDocument, string databaseName);
+
         IDatabaseCommands Commands { get; }
 	}
 
@@ -524,11 +529,6 @@ public interface IAdminDatabaseCommands
 		/// </summary>
 		void StartIndexing();
 
-		/// <summary>
-		/// Begins a backup operation
-		/// </summary>
-		void StartBackup(string backupLocation, DatabaseDocument databaseDocument);
-
 		/// <summary>
 		/// Get the indexing status
 		/// </summary>

diff --git a/Raven.Client.Lightweight/Extensions/MultiDatabase.cs b/Raven.Client.Lightweight/Extensions/MultiDatabase.cs
@@ -44,6 +44,20 @@ internal static void AssertValidName(string name)
             }
         }
 
+        /// <summary>
+        ///  Returns database url (system or non-system) based on system or non-system DB url.
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        public static string GetDatabaseUrl(string url, string database)
+        {
+            if (database == Constants.SystemDatabase)
+            {
+                return GetRootDatabaseUrl(url);
+            }
+            return GetRootDatabaseUrl(url) + "/databases/" + database + "/";
+        }
+
         public static string GetRootDatabaseUrl(string url)
         {
             var databaseUrl = url;

diff --git a/Raven.Studio/Features/Tasks/BackupDatabaseTask.cs b/Raven.Studio/Features/Tasks/BackupDatabaseTask.cs
@@ -50,7 +50,7 @@ protected override async Task<DatabaseTaskOutcome> RunImplementation()
             var databaseDocument = ApplicationModel.Current.Server.Value.DocumentStore.Conventions.CreateSerializer()
                                                    .Deserialize<DatabaseDocument>(new RavenJTokenReader(doc));
 
-            await DatabaseCommands.Admin.StartBackupAsync(backupLocation, databaseDocument);
+            await DatabaseCommands.GlobalAdmin.StartBackupAsync(backupLocation, databaseDocument, databaseName);
 
             var hasCompleted = false;
             var lastMessageTimeStamp = DateTime.MinValue;

diff --git a/Raven.Tests/Bundles/Encryption/EncryptionBackupAndRestore.cs b/Raven.Tests/Bundles/Encryption/EncryptionBackupAndRestore.cs
@@ -51,7 +51,7 @@ public async Task CanRestoreAnEncryptedDatabase(string storageEngineTypeName)
 				}
 
 				var backupFolderDb1 = NewDataPath("BackupFolderDb1");
-				await store.AsyncDatabaseCommands.ForDatabase("Db1").Admin.StartBackupAsync(backupFolderDb1, db1);
+				await store.AsyncDatabaseCommands.ForDatabase("Db1").GlobalAdmin.StartBackupAsync(backupFolderDb1, db1, "Db1");
 				WaitForBackup(store.DatabaseCommands.ForDatabase("Db1"), true);
 
 				await store.AsyncDatabaseCommands.GlobalAdmin.StartRestoreAsync(backupFolderDb1, @"~\Databases\Db2", "Db2");

diff --git a/Raven.Tests/Issues/RavenDB_1716.cs b/Raven.Tests/Issues/RavenDB_1716.cs
@@ -0,0 +1,43 @@
+// -----------------------------------------------------------------------
+//  <copyright file="RavenDB_1716.cs" company="Hibernating Rhinos LTD">
+//      Copyright (c) Hibernating Rhinos LTD. All rights reserved.
+//  </copyright>
+// -----------------------------------------------------------------------
+using System.Threading.Tasks;
+using Raven.Abstractions.Data;
+using Raven.Json.Linq;
+using Xunit;
+using Xunit.Extensions;
+
+namespace Raven.Tests.Issues
+{
+    public class RavenDB_1716 : RavenTest
+    {
+        [Theory]
+        [InlineData("esent")]
+        [InlineData("voron")]
+        public async Task Restore_operation_works_async(string storage)
+        {
+            var backupDir = NewDataPath("BackupDatabase");
+            var restoreDir = NewDataPath("RestoredDatabase");
+
+            using (var store = NewRemoteDocumentStore(runInMemory: false, requestedStorage: storage, databaseName: Constants.SystemDatabase))
+            {
+                store.DatabaseCommands.Put("keys/1", null, new RavenJObject { { "Key", 1 } }, new RavenJObject());
+
+                await store.AsyncDatabaseCommands.GlobalAdmin.StartBackupAsync(backupDir, new DatabaseDocument(), Constants.SystemDatabase);
+
+                WaitForBackup(store.DatabaseCommands, true);
+
+                // restore as a new database
+                await store.AsyncDatabaseCommands.GlobalAdmin.StartRestoreAsync(backupDir, restoreDir, "db1");
+
+                // get restore status and wait for finish
+                WaitForRestore(store.DatabaseCommands);
+                WaitForDocument(store.DatabaseCommands, "Raven/Databases/db1");
+
+                Assert.Equal(1, store.DatabaseCommands.ForDatabase("db1").Get("keys/1").DataAsJson.Value<int>("Key"));
+            }
+        }
+    }
+}
diff --git a/Raven.Tests/Issues/RavenDB_865.cs b/Raven.Tests/Issues/RavenDB_865.cs
diff --git a/Raven.Tests/Raven.Tests.csproj b/Raven.Tests/Raven.Tests.csproj
@@ -296,6 +296,7 @@
     <Compile Include="Issues\RavenDB_1610.cs" />
     <Compile Include="Issues\RavenDB_1650.cs" />
     <Compile Include="Issues\RavenDB_1666.cs" />
+    <Compile Include="Issues\RavenDB_1716.cs" />
     <Compile Include="Issues\RDBQA_4.cs" />
     <Compile Include="Issues\RavenDB_1553.cs" />
     <Compile Include="Issues\RavenDB_1555.cs" />
@@ -732,7 +733,6 @@
     <Compile Include="Issues\RavenDB_851.cs" />
     <Compile Include="Issues\RavenDB_863.cs" />
     <Compile Include="Issues\RavenDB_863_2.cs" />
-    <Compile Include="Issues\RavenDB_865.cs" />
     <Compile Include="Issues\RavenDB_868.cs" />
     <Compile Include="Issues\RavenDB_895.cs" />
     <Compile Include="Issues\RavenDB_967.cs" />