Fix --target-action and --recovery-option options being reported as i…

…nvalid when restoring with --type=immediate. Reported by Brad Nicholson.
pgbackrest · Jul 4, 2018 · ca2f8af · ca2f8af
1 parent 327e7c5
commit ca2f8af
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/doc/xml/release.xml b/doc/xml/release.xml
@@ -28,6 +28,14 @@
 
                          <p>Fix directory syncs running recursively when only the specified directory should be synced.</p>
                      </release-item>
+
+                     <release-item>
+                         <release-item-contributor-list>
+                             <release-item-ideator id="nicholson.brad"/>
+                         </release-item-contributor-list>
+
+                         <p>Fix <br-option>--target-action</br-option> and <br-option>--recovery-option</br-option> options being reported as invalid when restoring with <br-option>--type=immediate</br-option>.</p>
+                     </release-item>
                 </release-bug-list>
 
                 <release-improvement-list>
@@ -3999,6 +4007,11 @@
             <contributor-id type="github">jmccormick2001</contributor-id>
         </contributor>
 
+        <contributor id="nicholson.brad">
+            <contributor-name-display>Brad Nicholson</contributor-name-display>
+            <contributor-id type="github">bradnicholson</contributor-id>
+        </contributor>
+
         <contributor id="nullmeier.markus">
             <contributor-name-display>Markus Nullmeier</contributor-name-display>
             <contributor-id type="github">mnullmei</contributor-id>

diff --git a/lib/pgBackRest/Config/Data.pm b/lib/pgBackRest/Config/Data.pm
@@ -674,6 +674,7 @@ my %hConfigDefine =
                     &CFGDEF_DEPEND_OPTION => CFGOPT_TYPE,
                     &CFGDEF_DEPEND_LIST =>
                     [
+                        &CFGOPTVAL_RESTORE_TYPE_IMMEDIATE,
                         &CFGOPTVAL_RESTORE_TYPE_NAME,
                         &CFGOPTVAL_RESTORE_TYPE_TIME,
                         &CFGOPTVAL_RESTORE_TYPE_XID,
@@ -1695,6 +1696,7 @@ my %hConfigDefine =
             &CFGDEF_DEPEND_LIST =>
             [
                 &CFGOPTVAL_RESTORE_TYPE_DEFAULT,
+                &CFGOPTVAL_RESTORE_TYPE_IMMEDIATE,
                 &CFGOPTVAL_RESTORE_TYPE_NAME,
                 &CFGOPTVAL_RESTORE_TYPE_TIME,
                 &CFGOPTVAL_RESTORE_TYPE_XID,

diff --git a/src/config/define.auto.c b/src/config/define.auto.c
@@ -1674,6 +1674,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST
             (
                 cfgDefOptType,
                 "default",
+                "immediate",
                 "name",
                 "time",
                 "xid"
@@ -2598,6 +2599,7 @@ ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST
                 CFGDEFDATA_OPTION_OPTIONAL_DEPEND_LIST
                 (
                     cfgDefOptType,
+                    "immediate",
                     "name",
                     "time",
                     "xid"