Issue #162: direct call to TDTopezGemStoneClient>>restoreFromBackupFr…

…omClient:restoreSessionDescription:commitRestoreSessionDescription: when doing devKitCommandLine restore...allow for a restore session description (DataCurator/swordfish) that matches $GEMSTONE/bin/extent0.dbf and a commit restore session description (bozo/theClown) that matches the user/password required by restored system
GsDevKit · Jan 29, 2017 · c7a432c · c7a432c
1 parent f9a37b9
commit c7a432c
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 3 deletions.
diff --git a/...vKitRestoreFromBackupAlternateUserCommandLineHandler.class/instance/restoreFromBackup..st b/...vKitRestoreFromBackupAlternateUserCommandLineHandler.class/instance/restoreFromBackup..st
@@ -0,0 +1,6 @@
+actions
+restoreFromBackup: backupPath
+	self
+		restoreFromBackup: backupPath
+		restoreSessionDescription: self sessionDescription
+		commitRestoreSessionDescription: super sessionDescription
diff --git a/...kage/GsDevKitRestoreFromBackupAlternateUserCommandLineHandler.class/methodProperties.json b/...kage/GsDevKitRestoreFromBackupAlternateUserCommandLineHandler.class/methodProperties.json
@@ -5,5 +5,6 @@
 	"instance" : {
 		"activate" : "dkh 1/28/2017 15:51",
 		"password" : "dkh 1/28/2017 15:50",
+		"restoreFromBackup:" : "dkh 1/28/2017 17:04",
 		"sessionDescription" : "dkh 1/28/2017 15:50",
 		"userId" : "dkh 1/28/2017 15:50" } }
diff --git a/....package/GsDevKitRestoreFromBackupCommandLineHandler.class/instance/restoreFromBackup..st b/....package/GsDevKitRestoreFromBackupCommandLineHandler.class/instance/restoreFromBackup..st
@@ -0,0 +1,6 @@
+actions
+restoreFromBackup: backupPath
+	self
+		restoreFromBackup: backupPath
+		restoreSessionDescription: self sessionDescription
+		commitRestoreSessionDescription: self sessionDescription
diff --git a/.../instance/restoreFromBackup.restoreSessionDescription.commitRestoreSessionDescription..st b/.../instance/restoreFromBackup.restoreSessionDescription.commitRestoreSessionDescription..st
@@ -0,0 +1,11 @@
+actions
+restoreFromBackup: backupPath restoreSessionDescription: restoreSessionDescription commitRestoreSessionDescription: commitRestoreSessionDescription
+	| shell |
+	shell := TDShell sessionDescription: restoreSessionDescription.
+	shell batchMode: true.
+	[ 
+	shell topezClient
+		restoreFromBackupFromClient: backupPath
+		restoreSessionDescription: restoreSessionDescription
+		commitRestoreSessionDescription: commitRestoreSessionDescription ]
+		ensure: [ shell logout ]
diff --git a/...e.package/GsDevKitRestoreFromBackupCommandLineHandler.class/instance/restoreFromBackup.st b/...e.package/GsDevKitRestoreFromBackupCommandLineHandler.class/instance/restoreFromBackup.st
@@ -4,4 +4,4 @@ restoreFromBackup
 	backupReference := self backupfile asFileReference.
 	backupReference isAbsolute
 		ifFalse: [ backupReference := self backupsHome / self backupfile ].
-	TDShell sessionDescription: self sessionDescription evaluate: 'restoreBackup ' , backupReference pathString
+	self restoreFromBackup: backupReference pathString
diff --git a/...mmandLine.package/GsDevKitRestoreFromBackupCommandLineHandler.class/methodProperties.json b/...mmandLine.package/GsDevKitRestoreFromBackupCommandLineHandler.class/methodProperties.json
@@ -5,5 +5,7 @@
 	"instance" : {
 		"activate" : "dkh 10/19/2015 20:25",
 		"backupfile" : "dkh 7/19/2014 17:56",
-		"restoreFromBackup" : "dkh 1/28/2017 16:04",
+		"restoreFromBackup" : "dkh 1/28/2017 17:04",
+		"restoreFromBackup:" : "dkh 1/28/2017 17:03",
+		"restoreFromBackup:restoreSessionDescription:commitRestoreSessionDescription:" : "dkh 1/28/2017 17:02",
 		"stoneName" : "dkh 7/19/2014 17:37" } }
diff --git a/shared/repos/todeClient/GsDevKit-Tode-CommandLine.package/monticello.meta/version b/shared/repos/todeClient/GsDevKit-Tode-CommandLine.package/monticello.meta/version
@@ -1 +1 @@
-(name 'GsDevKit-Tode-CommandLine-dkh.8' message 'Issue #162: basic functionality implemented that allows newExtent `-s` option to be a gzipped extent file, raw extentfile, or a backup file ... at the moment only works when using gems with DataCurator/swordfish login so a bit more work is needed' id 'e0d69f25-4597-4852-b701-922480219f20' date '28 January 2017' time '4:18:24.421582 pm' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.7' message 'rename GsDevKitInstallTodeCommandLineHandler to GsDevKitLoadTodeCommandLineHandler' id '247b8709-f411-4abb-abc0-18adae252d00' date '30 October 2015' time '10:31:43.940246 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.6' message 'rename installTode* to loadTode*' id 'eef08f3a-9f77-45bb-80a7-785ea205e725' date '30 October 2015' time '10:19:01 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.5' message 'authorId added to TDSessionDescription so use it' id '0a57b0de-f249-4196-ab96-df10b04b97fc' date '19 October 2015' time '8:28:25 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.4' message 'rename GsDevKitEvaluateTodeCommandLineHandler to GsDevKitTodeItCommandLineHandler and remove requirement that todeIt command not be used with foreign stones ... todeIt should be usable with foreign stones' id '130adfed-a591-4e14-a86a-d7abc6277e72' date '19 October 2015' time '11:41:19 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.3' message 'Use sys/local overrides for removing backups from travis test tode scripts' id 'ad7ebcd4-8755-4fbc-b21e-cc4e613c8b10' date '17 October 2015' time '8:46:35 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.2' message 'use shouldNotBeForeignStone in all of the right placess to error out when foreign stone is not allowed' id '04c51e4d-6239-42d2-9b58-66a974e89f81' date '2 October 2015' time '4:11:18 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.1' message 'Split out the tODE-specific classes into a spearate package so that that they can be loaded by gsDevKitTodeCommandLineLoad.st (depends upon tODE client code). gsDevKitCommandLineLoad.st does not need tODE loaded' id '493fea2c-be52-4118-816b-65ca2c32a8c2' date '23 September 2015' time '8:24:18 am' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'GsDevKit-Tode-CommandLine-dkh.9' message 'Issue #162: direct call to TDTopezGemStoneClient>>restoreFromBackupFromClient:restoreSessionDescription:commitRestoreSessionDescription: when doing devKitCommandLine restore...allow for a restore session description (DataCurator/swordfish) that matches $GEMSTONE/bin/extent0.dbf and a commit restore session description (bozo/theClown) that matches the user/password required by restored system' id '5184cb63-8387-4433-a4a2-83126bac6f64' date '28 January 2017' time '5:13:49.152505 pm' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.8' message 'Issue #162: basic functionality implemented that allows newExtent `-s` option to be a gzipped extent file, raw extentfile, or a backup file ... at the moment only works when using gems with DataCurator/swordfish login so a bit more work is needed' id 'e0d69f25-4597-4852-b701-922480219f20' date '28 January 2017' time '4:18:24.421582 pm' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.7' message 'rename GsDevKitInstallTodeCommandLineHandler to GsDevKitLoadTodeCommandLineHandler' id '247b8709-f411-4abb-abc0-18adae252d00' date '30 October 2015' time '10:31:43.940246 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.6' message 'rename installTode* to loadTode*' id 'eef08f3a-9f77-45bb-80a7-785ea205e725' date '30 October 2015' time '10:19:01 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.5' message 'authorId added to TDSessionDescription so use it' id '0a57b0de-f249-4196-ab96-df10b04b97fc' date '19 October 2015' time '8:28:25 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.4' message 'rename GsDevKitEvaluateTodeCommandLineHandler to GsDevKitTodeItCommandLineHandler and remove requirement that todeIt command not be used with foreign stones ... todeIt should be usable with foreign stones' id '130adfed-a591-4e14-a86a-d7abc6277e72' date '19 October 2015' time '11:41:19 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.3' message 'Use sys/local overrides for removing backups from travis test tode scripts' id 'ad7ebcd4-8755-4fbc-b21e-cc4e613c8b10' date '17 October 2015' time '8:46:35 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.2' message 'use shouldNotBeForeignStone in all of the right placess to error out when foreign stone is not allowed' id '04c51e4d-6239-42d2-9b58-66a974e89f81' date '2 October 2015' time '4:11:18 am' author 'dkh' ancestors ((name 'GsDevKit-Tode-CommandLine-dkh.1' message 'Split out the tODE-specific classes into a spearate package so that that they can be loaded by gsDevKitTodeCommandLineLoad.st (depends upon tODE client code). gsDevKitCommandLineLoad.st does not need tODE loaded' id '493fea2c-be52-4118-816b-65ca2c32a8c2' date '23 September 2015' time '8:24:18 am' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())