Merge pull request #208 from dalehenrich/dev_dev

misc. bugfixes/features

repository/Topez-Server-33x-Core.package/TDAbstractDevTool.extension/instance/performOnServer.logging..st → repository/Tode-GemStone-Core2x.package/TDGemStoneTool.extension/instance/performOnServer.logging..st

@@ -1,12 +1,12 @@
-*topez-server-33x-core
+*tode-gemstone-core2x
 performOnServer: command logging: logging
   | result |
-  result := (System performOnServer: command) asUnicodeString.
+  result := System performOnServer: command.
   logging
     ifTrue: [ 
       Transcript
         cr;
         show: command printString;
         cr;
         show: result ].
-  ^ result
+  ^ result

repository/Tode-GemStone-Core2x.package/TDGemStoneTool.extension/instance/systemIsVoting.st

@@ -0,0 +1,4 @@
+*tode-gemstone-core2x
+systemIsVoting
+
+^false

repository/Tode-GemStone-Core3x.package/TDAbstractDevTool.extension/instance/performOnServer.logging..st

@@ -0,0 +1,31 @@
+*tode-gemstone-core3x
+performOnServer: commandLine logging: logging
+  | result |
+  result := self
+    performOnServer: commandLine
+    status: [ :performOnServerStatusArray | 
+      "Array of 5 elements: 
+       raw status Integer, 
+       child process status Integer (after WEXITSTATUS macro applied), 
+       result String (or nil if operation failed) ,
+       error string from script file write, fork, or result file read ,
+       errno value, a SmallInteger from file write, fork, or file read"
+      (performOnServerStatusArray at: 1) ~~ 0
+        ifTrue: [ 
+          | message |
+          message := 'performOnServer: ' , commandLine printString , ' stdout: '
+            , (performOnServerStatusArray at: 3) printString
+            , ' failed with status: '
+            , (performOnServerStatusArray at: 1) printString , ' errno: '
+            , (performOnServerStatusArray at: 5) printString , ' errStr: '
+            , (performOnServerStatusArray at: 4) asString.
+          self error: message ].
+      performOnServerStatusArray at: 3 ].
+  logging
+    ifTrue: [ 
+      Transcript
+        cr;
+        show: commandLine printString;
+        cr;
+        show: result ].
+  ^ result

repository/Tode-GemStone-Core3x.package/TDAbstractDevTool.extension/instance/performOnServer.status..st

@@ -0,0 +1,5 @@
+*tode-gemstone-core3x
+performOnServer: commandLine status: statusBlock
+  | performOnServerStatusArray |
+  performOnServerStatusArray := System _performOnServer: commandLine.
+  ^ statusBlock value: performOnServerStatusArray

repository/Tode-GemStone-Core3x.package/TDAbstractDevTool.extension/methodProperties.json

@@ -0,0 +1,6 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"performOnServer:logging:" : "dkh 09/16/2015 14:27",
+		"performOnServer:status:" : "dkh 09/16/2015 14:29" } }

repository/Tode-GemStone-Core3x.package/TDGemStoneTool.extension/instance/systemIsVoting.st

@@ -0,0 +1,6 @@
+*tode-gemstone-core3x
+systemIsVoting
+  | vs sessId |
+  vs := System voteState.
+  sessId := System sessionIdHoldingGcLock.
+  ^ sessId ~= 0 or: [ vs > 0 and: [ vs < 4 ] ]

repository/Tode-GemStone-Core3x.package/TDGemStoneTool.extension/methodProperties.json

@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"buBackup:safely:" : "dkh 03/22/2015 07:41" } }
+		"systemIsVoting" : "dkh 09/16/2015 14:56" } }

repository/Tode-GemStone-Core3x.package/monticello.meta/version

@@ -1 +1 @@
-(name 'Tode-GemStone-Core3x-dkh.2' message 'add --safely option to `bu backup` command' id 'c59dc3b6-a4e5-4e60-b5f8-1e4622b999b8' date '03/22/2015' time '08:07:11' author 'dkh' ancestors ((name 'Tode-GemStone-Core3x-dkh.1' message 'fixing `bu` command for 2.4.x' id '6fc89f19-19a6-4eac-af9b-30576a638d2e' date '11/20/2014' time '11:21:19' author 'dkh' ancestors () stepChildren ())) stepChildren ())
+(name 'Tode-GemStone-Core3x-dkh.3' message 'Issue #202: add --uncompressed option to `bu backup` command. Default for `bu backup` is to create a compressed backup. Also add a `bu validate` command for validating the readability of backup files ... update tests ,, improve (hopefully) performOnServer: functionality by getting back explicit command status' id '6f045600-4da2-4552-b935-8d8e96f40ce5' date '09/16/2015' time '15:45:20' author 'dkh' ancestors ((name 'Tode-GemStone-Core3x-dkh.2' message 'add --safely option to `bu backup` command' id 'c59dc3b6-a4e5-4e60-b5f8-1e4622b999b8' date '03/22/2015' time '08:07:11' author 'dkh' ancestors ((name 'Tode-GemStone-Core3x-dkh.1' message 'fixing `bu` command for 2.4.x' id '6fc89f19-19a6-4eac-af9b-30576a638d2e' date '11/20/2014' time '11:21:19' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/class/buManPage.st

@@ -20,6 +20,7 @@ DESCRIPTION
     remove    Remove backup file from backup directory
     restore   Restore from a GemStone backup
     snapshot  Make a snapshot of the extent0.dbf file
+    validate  Validate that backup file is readable
 
 OPTIONS
   --help
@@ -42,5 +43,6 @@ EXAMPLES
     at: 'restore' put: self burestoreManPage;
     at: 'remove' put: self buremoveManPage;
     at: 'snapshot' put: self busnapshotManPage;
+    at: 'validate' put: self buvalidateManPage;
     yourself.
   ^ manPage

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/class/bubackupManPage.st

@@ -7,10 +7,12 @@ bubackupManPage
   bu backup - Make a GemStone backup
 
 SYNOPSIS
-  bu [--dir=<backup-directory>] backup [--safely] <backup-file>
+  bu [--dir=<backup-directory>] backup [--safely] [--uncompressed] <backup-file>
 
 DESCRIPTION
-  Make a GemStone backup in the specified backup file.
+  Make a GemStone backup in the specified backup file. By default a compressed 
+  backup is created and a `.gz` is tacked onto the end of the <backup-file> if 
+  not already present.
 
   With no options specified, the backup file will be located in the directory 
   specified by the `bu directory` command. The default backup directory is named
@@ -19,11 +21,15 @@ DESCRIPTION
   With the --dir option specified, the backup file will be stored in the named
   directory.
 
-  With the --safely option specified, the snapshot will (quietly) be skipped if
-  the target snapshot already exists.
+  With the --safely option specified, the backup will (quietly) be skipped if
+  the target backup file already exists.
+
+  With the --uncompressed option an uncompressed backup is created in the named
+  <backup-file>.
 
 EXAMPLES
   bu --help backup
+  bu backup --uncompressed sample.dbf
   bu backup sample.dbf
   bu backup --safely sample.dbf
   bu --dir=/opt/gemstone/backups backup sample.dbf
@@ -33,4 +39,5 @@ SEE ALSO
   bu --help info
   bu --help list
   bu --help restore
+  bu --help validate
 '

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/class/buremoveManPage.st

@@ -26,8 +26,8 @@ DESCRIPTION
 EXAMPLES
   bu --help remove
   bu remove sample.dbf
-  bu remove --snapshot extent0.sample.dbf
   bu --dir=/opt/gemstone/backups remove sample.dbf
+  bu remove --snapshot extent0.sample.dbf
   bu --dir=--dir=$GS_HOME/gemstone/snapshots remove extent0.sample.dbf
 
 SEE ALSO

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/class/burestoreManPage.st

@@ -21,7 +21,8 @@ DESCRIPTION
 
 EXAMPLES
   bu restore sample.dbf
-  bu --dir=/opt/gemstone/backups restore sample.dbf
+  bu restore sample.dbf.gz
+  bu --dir=/opt/gemstone/backups restore sample.dbf.gz
 
 SEE ALSO
   bu --help backup

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/class/buvalidateManPage.st

@@ -0,0 +1,35 @@
+bu
+buvalidateManPage
+  ^ TDManPage
+    commandName: 'validate'
+    fromString:
+      'NAME
+  bu validate - Validate that backup file is readable
+
+SYNOPSIS
+  bu [--dir=<backup-directory>] validate [--snapshot] <backup-file>
+
+DESCRIPTION
+  Verify the readability of the specified bacup file.
+
+  With no options specified, the backup file will be read from the directory 
+  specified by the `bu directory` command. The default backup directory is named
+  ''backups'' and is located in the $GEMSTONE_DATADIR.
+
+  With the --dir option specified, the restore file will be read from the named
+  directory.
+
+  With the --snapshot option specified the <backup-file> in the snapshot directory
+  will be validated.
+
+EXAMPLES
+  bu validate sample.dbf.gz
+  bu --dir=/opt/gemstone/backups validate sample.dbf.gz
+  bu validate --snapshot extent0.sample.dbf
+
+SEE ALSO
+  bu --help backup
+  bu --help directory
+  bu --help info
+  bu --help list
+'

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/instance/buBackup.safely..st

@@ -0,0 +1,3 @@
+bu
+buBackup: backupPath safely: safely
+  ^ self buBackup: backupPath safely: safely uncompressed: false

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/instance/buBackup.safely.uncompressed..st

@@ -0,0 +1,26 @@
+bu
+buBackup: backupPath safely: safely uncompressed: uncompressed
+  | theBackupPath |
+  self systemIsVoting
+    ifTrue: [ ^ 'Please wait until system is no longer voting and try again' ].
+  Transcript
+    cr;
+    show: '---Starting backup to ' , backupPath printString , ' (';
+    show: TimeStamp now asString;
+    show: ')'.
+  theBackupPath := uncompressed
+    ifTrue: [ backupPath ]
+    ifFalse: [ 
+      | postFix |
+      postFix := '.gz'.
+      (backupPath endsWith: postFix)
+        ifTrue: [ backupPath ]
+        ifFalse: [ 
+          ".gz automatically added to filename during compressed backup"
+          backupPath , postFix ] ].
+  self fullBackupTo: theBackupPath safely: safely uncompressed: uncompressed.
+  self class lastBackup: theBackupPath.
+  Transcript
+    cr;
+    show: '---Finished backup to ' , LastBackup.
+  ^ theBackupPath

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/instance/buValidateReadableBackupFile..st

@@ -0,0 +1,3 @@
+bu
+buValidateReadableBackupFile: backupFilePath
+  ^ self copydbf: '' forFilePath: backupFilePath , ' /dev/null'

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/instance/bubackup.st

@@ -1,14 +1,21 @@
 bu
 bubackup
   "
-  bu [--dir=<backup-directory>] backup [--safely] <backup-file>
+  bu [--dir=<backup-directory>] backup [--safely] [--uncompressed] <backup-file>
 "
 
-  | backupFilePath safely |
-  self getSubcommandOptsMixedLongShort: {#('safely' nil #'none')}.
+  | backupFilePath safely uncompressed |
+  self
+    getSubcommandOptsMixedLongShort:
+      {#('safely' nil #'none').
+      #('uncompressed' nil #'none')}.
   backupFilePath := self resolveBackupFilePath.
   subOptions
     at: 'safely'
     ifPresent: [ :ignored | safely := true ]
     ifAbsent: [ safely := false ].
-  ^ self buBackup: backupFilePath safely: safely
+  subOptions
+    at: 'uncompressed'
+    ifPresent: [ :ignored | uncompressed := true ]
+    ifAbsent: [ uncompressed := false ].
+  ^ self buBackup: backupFilePath safely: safely uncompressed: uncompressed

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/instance/buinfo.st

@@ -4,12 +4,10 @@ buinfo
   bu [--dir=<backup-directory>] info [--snapshot] <backup-file>
 "
 
-  | backupFilePath copyDbfCommand |
+  | filePath copyDbfCommand |
   self getSubcommandOptsMixedLongShort: {#('snapshot' nil #'none')}.
-  subOptions
+  filePath := subOptions
     at: 'snapshot'
-    ifPresent: [ :ignored | backupFilePath := self resolveSnapshotFilePath ]
-    ifAbsent: [ backupFilePath := self resolveBackupFilePath ].
-  copyDbfCommand := (GsFile _expandEnvVariable: 'GEMSTONE' isClient: false)
-    , '/bin/copydbf -i ' , backupFilePath.
-  ^ System performOnServer: copyDbfCommand
+    ifPresent: [ :ignored | self resolveSnapshotFilePath ]
+    ifAbsent: [ self resolveBackupFilePath ].
+  ^ self copydbf: '-i' forFilePath: filePath

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/instance/buremove.st

@@ -4,10 +4,10 @@ buremove
   bu [--dir=<backup-directory>] remove [--snapshot] <backup-file>
 "
 
-  | backupFilePath |
+  | filePath |
   self getSubcommandOptsMixedLongShort: {#('snapshot' nil #'none')}.
-  subOptions
+  filePath := subOptions
     at: 'snapshot'
-    ifPresent: [ :ignored | backupFilePath := self resolveSnapshotFilePath ]
-    ifAbsent: [ backupFilePath := self resolveBackupFilePath ].
-  ^ self buRemove: backupFilePath
+    ifPresent: [ :ignored | self resolveSnapshotFilePath ]
+    ifAbsent: [ self resolveBackupFilePath ].
+  ^ self buRemove: filePath

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/instance/buvalidate.st

@@ -0,0 +1,13 @@
+bu
+buvalidate
+  "
+  bu [--dir=<backup-directory>] validate [--snapshot] <backup-file>
+"
+
+  | filePath |
+  self getSubcommandOptsMixedLongShort: {#('snapshot' nil #'none')}.
+  filePath := subOptions
+    at: 'snapshot'
+    ifPresent: [ :ignored | self resolveSnapshotFilePath ]
+    ifAbsent: [ self resolveBackupFilePath ].
+  self buValidateReadableBackupFile: filePath

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/instance/copydbf.forFilePath..st

@@ -0,0 +1,6 @@
+bu
+copydbf: args forFilePath: filePath
+  | copyDbfCommand |
+  copyDbfCommand := (GsFile _expandEnvVariable: 'GEMSTONE' isClient: false)
+    , '/bin/copydbf ' , args , ' ' , filePath.
+  ^ self performOnServer: copyDbfCommand logging: true

repository/Tode-GemStone-Server-Core.package/TDGemStoneTool.class/instance/fullBackupTo.safely..st

@@ -1,27 +1,3 @@
 bu
 fullBackupTo: backupPath safely: safely
-  | backupFilename backupDirName backupDir result |
-  ServerFileDirectory
-    splitName: backupPath
-    to: [ :dirPath :filename | 
-      backupDirName := dirPath.
-      backupFilename := filename ].
-  backupDir := ServerFileDirectory on: backupDirName.
-  (backupDir fileExists: backupFilename)
-    ifTrue: [ 
-      safely
-        ifTrue: [ 
-          Transcript
-            cr;
-            show:
-                'Skipping backup, --safely specified and ' , backupFilename printString
-                    , ' exists.'.
-          ^ false ].
-      backupDir deleteFileNamed: backupFilename ].
-  System commitTransaction.
-  result := SystemRepository fullBackupTo: backupPath.
-  result == true
-    ifFalse: [ ^ self error: 'Could not complete the backup: ' , result ].	"we have been left outside of transaction in manual
-	 transaction mode"
-  System transactionMode: #'autoBegin'.
-  ^ true
+  ^ self fullBackupTo: backupPath safely: safely uncompressed: false