zfstools 0.2.2 → 0.3.0

data/README.md

@@ -49,6 +49,14 @@ Setting a MySQL dataset's property to `mysql` will hook it into the `zfs-snapsho
 
     zfs set com.sun:auto-snapshot=mysql DATASET
 
+##### PostgreSQL Support
+
+Setting a PostgreSQL dataset's property to `postgresql` will cause zfs-auto-snapshot to put postgresql in online backup mode for the snapshot.
+
+    zfs set com.sun:auto-snapshot=postgresql DATASET
+
+The user executing `zfs-auto-snapshot` will require passwordless login to the `postgres` database and will require either REPLICATION or SUPERUSER privileges. The easiest approach is to set up a trust or ident record in your pg_hba.conf. The `zfs-auto-snapshot` script will execute pg_start_backup() prior to saving the snapshot and execute pg_stop_backup() afterwards. 
+
 ##### Overrides
 
 You can override a child dataset to use, or not use auto snapshotting by settings its flag with the given interval.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/zfstools.rb

@@ -111,7 +111,7 @@ def filter_datasets(datasets, included_excluded_datasets, property)
     # If the dataset is already included/excluded, skip it (for override checking)
     next if all_datasets.include? dataset
     value = dataset.properties[property]
-    if value == "true" || value == "mysql"
+    if ["true","mysql","postgresql"].include? value
       included_excluded_datasets['included'] << dataset
     elsif value
       included_excluded_datasets['excluded'] << dataset

data/lib/zfstools/dataset.rb

@@ -6,7 +6,7 @@ module Zfs
     def initialize(name, properties={}, options={})
       @name = name
       @properties = properties
-      if properties[snapshot_property] == "mysql"
+      if ["mysql","postgresql"].include? properties[snapshot_property]
         self.contains_db!(properties[snapshot_property])
       end
     end

data/lib/zfstools/snapshot.rb

@@ -59,6 +59,11 @@ module Zfs
             UNLOCK TABLES;
           EOF
           cmd = %Q[mysql -e "#{sql_query}"]
+        when 'postgresql'
+          sql_pre_query = "SELECT PG_START_BACKUP('zfs-auto-snapshot');"
+          sql_post_query = "SLEECT PG_STOP_BACKUP();"
+          zfs_cmd = cmd
+          cmd = %Q[(psql -c "#{sql_pre_query}" postgres && #{zfs_cmd} ) ; psql -c "#{sql_post_query}" postgres]
         end
       end
 

data/zfstools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "zfstools"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Drewery"]
-  s.date = "2013-02-04"
+  s.date = "2013-09-18"
   s.description = "ZFS admin scripts, such as automatic snapshots, mysql snapshotting, scrubbing, etc."
   s.email = "bryan@shatow.net"
   s.executables = ["zfs-auto-snapshot", "zfs-cleanup-snapshots", "zfs-snapshot-mysql"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfstools
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20923260 !ruby/object:Gem::Requirement
+  requirement: &16686440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *20923260
+  version_requirements: *16686440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &19966840 !ruby/object:Gem::Requirement
+  requirement: &16683840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *19966840
+  version_requirements: *16683840
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19964120 !ruby/object:Gem::Requirement
+  requirement: &16698280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *19964120
+  version_requirements: *16698280
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &19963020 !ruby/object:Gem::Requirement
+  requirement: &16697540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19963020
+  version_requirements: *16697540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19960960 !ruby/object:Gem::Requirement
+  requirement: &16696100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19960960
+  version_requirements: *16696100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19960160 !ruby/object:Gem::Requirement
+  requirement: &16693840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *19960160
+  version_requirements: *16693840
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &19975720 !ruby/object:Gem::Requirement
+  requirement: &16692980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19975720
+  version_requirements: *16692980
 description: ZFS admin scripts, such as automatic snapshots, mysql snapshotting, scrubbing,
   etc.
 email: bryan@shatow.net
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1946936266483183679
+      hash: 365318782876626862
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: