Remove `upgrade` subcommand and log on restore

The `upgrade` subcommand from `skyd` which was removed in 0.7, but was
erroneously accepted in the CLI parameters has been removed. This
was silently ignored.

CHANGELOG.md

@@ -7,6 +7,10 @@ All changes in this project will be noted in this file.
 ### Fixes
 
 - Fixed infinite wait (loop) when sample space for key generation is not large enough
+- Removed `upgrade` subcommand from `skyd` which was removed in 0.7, but was erroneously accepted in the CLI
+  parameters
+- Restored ability to use `--restore <backupdir>` to restore data from previous snapshots which was silently
+  ignored
 
 ### Additions
 
@@ -194,6 +198,7 @@ All changes in this project will be noted in this file.
 - All actions now accept the `AnyArray` type introduced in Skyhash 1.1
 - `POP` now accepts one key while `MPOP` accepts multiple keys
 - Disk storage format has changed
+- The `upgrade` subcommand has been removed
 
 ## Version 0.6.4 [2021-08-05]
 

server/src/cli.yml

@@ -14,8 +14,8 @@ args:
       short: r
       required: false
       long: restore
-      value_name: snapshotfile
-      help: Restores data from a previous snapshot
+      value_name: backupdir
+      help: Restores data from a previous snapshot made in the provided directory
       takes_value: true
   - host:
       short: h
@@ -109,14 +109,3 @@ args:
       short: m
       help: Sets the deployment type
       value_name: mode
-subcommands:
-  - upgrade:
-      about: Upgrades old datsets to the latest format supported by this server edition
-      args:
-        - format:
-            short: f
-            long: from
-            takes_value: true
-            value_name: format
-            required: true
-            help: The format of the old files which need to be upgraded

server/src/services/mod.rs

@@ -33,6 +33,7 @@ pub fn restore_data(src: Option<String>) -> IoResult<()> {
     if let Some(src) = src {
         // hmm, so restore it
         os::recursive_copy(src, "data")?;
+        log::info!("Successfully restored data from snapshot");
     }
     Ok(())
 }