Skip to content

Commit

Permalink
status
Browse files Browse the repository at this point in the history
  • Loading branch information
pstorz committed Nov 27, 2018
1 parent ba3b483 commit 3c2310b
Show file tree
Hide file tree
Showing 31 changed files with 411 additions and 393 deletions.
52 changes: 35 additions & 17 deletions docs/manuals/en/new_main_reference/replace.sh
Expand Up @@ -92,6 +92,7 @@ sed -i -E 's|:raw-latex:`\\sinceVersion\{(.*)\}\{(.*)\}\{(.*)\}`|\3|g' *.rst

# file
sed -i -E 's|:raw-latex:`\\file\{(.*)\}`|:file:`\1`|g' *.rst
sed -i -E 's|:raw-latex:`\\directory\{(.*)\}`|:file:`\1`|g' *.rst

# clean empty :: at the start of line
sed -i -E 's#^::$##g' *.rst
Expand Down Expand Up @@ -139,6 +140,40 @@ sed -i -E 's#:raw-latex:`\\name\{(.*)\}`#**\1**#g' *.rst

sed -i -E 's#:raw-latex:`\\resourcename\{(.*)\}\{(.*)\}\{(.*)\}`#**\3**:sup:`\1`:sub:`\2`\ #g' *.rst

perl -i -pe 's#:raw-latex:`\\argument\{(.*?)\}`#:strong:`\1`#g' *.rst


#\dt
perl -i -pe 's#:raw-latex:`\\dt\{([A-Za-z ]*)\}`#:strong:`\1`\ #g' *.rst

perl -i -pe 's#:raw-latex:`\\bcommand\{(.*?)\}`#:strong:`\1`#g' *.rst


# TODO: add link
sed -i -E 's#:raw-latex:`\\linkResourceDirective\{(.*)\}\{(.*)\}\{(.*)\}`#**\3**:sup:`\1`:sub:`\2`\ #g' *.rst




perl -i -pe 's#:raw-latex:`\\host\{(.*?)\}`#:strong:`\1`#g' *.rst

sed -i 's#:raw-latex:`\\fileStoragePath`#:file:`/var/lib/bareos/storage/`#g' *.rst
sed -i 's#:raw-latex:`\\scriptPathUnix`#:file:`/usr/lib/bareos/scripts/`#g' *.rst
sed -i 's#:raw-latex:`\\configPathUnix`#:file:`/etc/bareos/`#g' *.rst
sed -i 's#:raw-latex:`\\configFileDirUnix`#:file:`/etc/bareos/bareos-dir.conf`#g' *.rst
sed -i 's#:raw-latex:`\\configFileSdUnix`#:file:`/etc/bareos/bareos-sd.conf`#g' *.rst
sed -i 's#:raw-latex:`\\configFileFdUnix}`#:file:`/etc/bareos/bareos-fd.conf`#g' *.rst
sed -i 's#:raw-latex:`\\configFileBconsoleUnix}`#:file:`/etc/bareos/bconsole.conf`#g' *.rst
sed -i 's#:raw-latex:`\\configFileTrayMonitorUnix`#:file:`/etc/bareos/tray-monitor.conf`#g' *.rst
sed -i 's#:raw-latex:`\\configFileBatUnix`#:file:`/etc/bareos/bat.conf`#g' *.rst
sed -i 's#:raw-latex:`\\configDirectoryDirUnix`#:file:`/etc/bareos/bareos-dir.d/`#g' *.rst
sed -i 's#:raw-latex:`\\configDirectorySdUnix`#:file:`/etc/bareos/bareos-sd.d/`#g' *.rst
sed -i 's#:raw-latex:`\\configDirectoryFdUnix`#:file:`/etc/bareos/bareos-fd.d/`#g' *.rst
sed -i 's#:raw-latex:`\\configDirectoryBconsoleUnix`#:file:`/etc/bareos/bconsole.d/`#g' *.rst
sed -i 's#:raw-latex:`\\configDirectoryTrayMonitorUnix`#:file:`/etc/bareos/tray-monitor.d/`#g' *.rst
sed -i 's#:raw-latex:`\\logfileUnix`#:file:`/var/log/bareos/bareos.log`#g' *.rst
sed -i 's#:raw-latex:`\\yeno`#yes\\|no#g' *.rst


#
# DROP SOME STUFF WHICH IS NO LONGER NEEDED
Expand All @@ -154,22 +189,6 @@ sed -i -E 's#:raw-latex:`\\resourcename\{(.*)\}\{(.*)\}\{(.*)\}`#**\3**:sup:`\1`
## Bareos path and filenames
##
#
#sed -i 's#:raw-latex:`\\fileStoragePath`#*/var/lib/bareos/storage/*#g' *.rst
#sed -i 's#:raw-latex:`\\scriptPathUnix`#*/usr/lib/bareos/scripts/*#g' *.rst
#sed -i 's#:raw-latex:`\\configPathUnix`#*/etc/bareos/*#g' *.rst
#sed -i 's#:raw-latex:`\\configFileDirUnix`#*/etc/bareos/bareos-dir.conf*#g' *.rst
#sed -i 's#:raw-latex:`\\configFileSdUnix`#*/etc/bareos/bareos-sd.conf*#g' *.rst
#sed -i 's#:raw-latex:`\\configFileFdUnix}`#*/etc/bareos/bareos-fd.conf*#g' *.rst
#sed -i 's#:raw-latex:`\\configFileBconsoleUnix}`#*/etc/bareos/bconsole.conf*#g' *.rst
#sed -i 's#:raw-latex:`\\configFileTrayMonitorUnix`#*/etc/bareos/tray-monitor.conf*#g' *.rst
#sed -i 's#:raw-latex:`\\configFileBatUnix`#*/etc/bareos/bat.conf*#g' *.rst
#sed -i 's#:raw-latex:`\\configDirectoryDirUnix`#*/etc/bareos/bareos-dir.d/*#g' *.rst
#sed -i 's#:raw-latex:`\\configDirectorySdUnix`#*/etc/bareos/bareos-sd.d/*#g' *.rst
#sed -i 's#:raw-latex:`\\configDirectoryFdUnix`#*/etc/bareos/bareos-fd.d/*#g' *.rst
#sed -i 's#:raw-latex:`\\configDirectoryBconsoleUnix`#*/etc/bareos/bconsole.d/*#g' *.rst
#sed -i 's#:raw-latex:`\\configDirectoryTrayMonitorUnix`#*/etc/bareos/tray-monitor.d/*#g' *.rst
#sed -i 's#:raw-latex:`\\logfileUnix`#*/var/log/bareos/bareos.log*#g' *.rst
#sed -i 's#:raw-latex:`\\yeno`#yes\\|no#g' *.rst
#
##
## General
Expand Down Expand Up @@ -203,7 +222,6 @@ sed -i -E 's#:raw-latex:`\\resourcename\{(.*)\}\{(.*)\}\{(.*)\}`#**\3**:sup:`\1`
#sed -i -E 's|:raw-latex:`\\argument\{(.*)\}`|**\1**|g' *.rst
#sed -i -E 's|:raw-latex:`\\variable\{(.*)\}`|**\1**|g' *.rst
#
#sed -i -E 's#:raw-latex:`\\dt([A-Za-z ]*)`#\1#g' *.rst
#
#
#
Expand Down
62 changes: 31 additions & 31 deletions docs/manuals/en/new_main_reference/source/always-incremental.rst
Expand Up @@ -70,7 +70,7 @@ These two steps are then executed every day:
- Consolidation of the jobs older than maximum configure age

Deleted files will be in the backup forever, if they are not detected as
deleted using :raw-latex:`\linkResourceDirective{Dir}{Job}{Accurate}`
deleted using **Accurate**:sup:`Dir`:sub:`Job`
backup.

The Always Incremental Backup Scheme does not provide the option to have
Expand Down Expand Up @@ -138,16 +138,16 @@ configuration is required:
:raw-latex:`\linkResourceDirectiveValue{Dir}{Job}{Always Incremental}{yes}`
enables the Always Incremental feature.

:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Job Retention}`
**Always Incremental Job Retention**:sup:`Dir`:sub:`Job`
set the age where incrementals of this job will be kept, older jobs
will be consolidated.

:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Keep Number}`
**Always Incremental Keep Number**:sup:`Dir`:sub:`Job`
sets the number of incrementals that will be kept without regarding
the age. This should make sure that a certain history of a job will
be kept even if the job is not executed for some time.

:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Max Full Age}`
**Always Incremental Max Full Age**:sup:`Dir`:sub:`Job`
is described later, see
:ref:`section-AlwaysIncrementalMaxFullAge`.

Expand Down Expand Up @@ -176,7 +176,7 @@ Consolidate Job
:raw-latex:`\linkResourceDirectiveValue{Dir}{Job}{Accurate}{yes}`
let the generated virtual backup job keep the accurate information.

:raw-latex:`\linkResourceDirective{Dir}{Job}{Max Full Consolidations}`
**Max Full Consolidations**:sup:`Dir`:sub:`Job`
is described later, see
:ref:`section-MaxFullConsolidations`.

Expand Down Expand Up @@ -314,13 +314,13 @@ The following image shows the available backups for each day:
- Every day a incremental backup is done and is additionally available.

- When the age of the oldest incremental reaches
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Job Retention}`,
**Always Incremental Job Retention**:sup:`Dir`:sub:`Job` ,
the consolidation job consolidates the oldest incremental with the
full backup before to a new full backup.

This can go on more or less forever and there will be always an
incremental history of
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Job Retention}`.
**Always Incremental Job Retention**:sup:`Dir`:sub:`Job` .

The following plot shows what happens if a job is not run for a certain
amount of time.
Expand All @@ -332,18 +332,18 @@ until the last incremental is too old and then only one full backup is
left. This is usually not what is intended.

For this reason, the directive
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Keep Number}`
**Always Incremental Keep Number**:sup:`Dir`:sub:`Job`
is available which sets the minimum number of incrementals that should
be kept even if they are older than
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Job Retention}`.
**Always Incremental Job Retention**:sup:`Dir`:sub:`Job` .

Setting
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Keep Number}`
**Always Incremental Keep Number**:sup:`Dir`:sub:`Job`
to 7 in our case leads to the following result:

|image|

:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Keep Number}`
**Always Incremental Keep Number**:sup:`Dir`:sub:`Job`
incrementals are always kept, and when the backup starts again the
consolidation of old incrementals starts again.

Expand Down Expand Up @@ -395,29 +395,29 @@ Always Incremental Max Full Age
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

To be able to cope with this problem, the directive
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Max Full Age}`
**Always Incremental Max Full Age**:sup:`Dir`:sub:`Job`
was added. When
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Max Full Age}`
**Always Incremental Max Full Age**:sup:`Dir`:sub:`Job`
is configured, in daily operation the Full Backup is left untouched
while the incrementals are consolidated as usual. Only if the Full
Backup is older than
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Max Full Age}`,
**Always Incremental Max Full Age**:sup:`Dir`:sub:`Job` ,
the full backup will also be part of the consolidation.

Depending on the setting of the
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Max Full Age}`,
**Always Incremental Max Full Age**:sup:`Dir`:sub:`Job` ,
the amount of daily data being moved can be reduced without losing the
advantages of the always incremental Backup Scheme.

:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Max Full Age}`
**Always Incremental Max Full Age**:sup:`Dir`:sub:`Job`
must be larger than
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Job Retention}`.
**Always Incremental Job Retention**:sup:`Dir`:sub:`Job` .

The resulting interval between full consolidations when running daily
backups and daily consolidations is
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Max Full Age}`
**Always Incremental Max Full Age**:sup:`Dir`:sub:`Job`
-
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Job Retention}`.
**Always Incremental Job Retention**:sup:`Dir`:sub:`Job` .

.. raw:: latex

Expand All @@ -443,10 +443,10 @@ Max Full Consolidations
~~~~~~~~~~~~~~~~~~~~~~~

When the
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Max Full Age}`
**Always Incremental Max Full Age**:sup:`Dir`:sub:`Job`
of many clients is set to the same value, it is probable that all full
backups will reach the
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Max Full Age}`
**Always Incremental Max Full Age**:sup:`Dir`:sub:`Job`
at once and so consolidation jobs including the full backup will be
started for all clients at once. This would again mean that the whole
data being stored from all clients will be moved in one day.
Expand All @@ -461,10 +461,10 @@ As can be seen, virtual jobs including the full are triggered for all
three clients at the same time.

This is of course not desirable so the directive
:raw-latex:`\linkResourceDirective{Dir}{Job}{Max Full Consolidations}`
**Max Full Consolidations**:sup:`Dir`:sub:`Job`
was introduced.

:raw-latex:`\linkResourceDirective{Dir}{Job}{Max Full Consolidations}`
**Max Full Consolidations**:sup:`Dir`:sub:`Job`
needs to be configured in the
:raw-latex:`\resourceDirectiveValue{Dir}{Job}{Type}{Consolidate}` job:

Expand All @@ -484,7 +484,7 @@ needs to be configured in the
}
If
:raw-latex:`\linkResourceDirective{Dir}{Job}{Max Full Consolidations}`
**Max Full Consolidations**:sup:`Dir`:sub:`Job`
is configured, the consolidation job will not start more than the
specified Consolidations that include the Full Backup.

Expand All @@ -494,9 +494,9 @@ jobs are completed before the next normal backup run starts.

The number of always incremental jobs, the interval that the jobs are
triggered and the setting of
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Max Full Age}`
**Always Incremental Max Full Age**:sup:`Dir`:sub:`Job`
influence the value that makes sense for
:raw-latex:`\linkResourceDirective{Dir}{Job}{Max Full Consolidations}`.
**Max Full Consolidations**:sup:`Dir`:sub:`Job` .

.. raw:: latex

Expand Down Expand Up @@ -527,7 +527,7 @@ store a certain job for a longer time.

When using always incremental, the usual maximum age of data stored
during the backup cycle is
:raw-latex:`\linkResourceDirective{Dir}{Job}{Always Incremental Job Retention}`.
**Always Incremental Job Retention**:sup:`Dir`:sub:`Job` .

Usually, it is desired to be able to store a certain backup for a longer
time, e.g. monthly a backup should be kept for half a year.
Expand Down Expand Up @@ -604,7 +604,7 @@ To make sure the longterm
not taken as base for the next incrementals, the job type of the copied
job is set to
:raw-latex:`\resourceDirectiveValue{Dir}{Job}{Type}{Archive}` with the
:raw-latex:`\linkResourceDirective{Dir}{Job}{Run Script}`.
**Run Script**:sup:`Dir`:sub:`Job` .

As can be seen on the plot, the
:raw-latex:`\resourceDirectiveValue{Dir}{Job}{Level}{VirtualFull}`
Expand Down Expand Up @@ -691,7 +691,7 @@ storage:
| 1 | Full-0001 | Append | 1 | 38600329 | 0 | 31536000 | 1 | 0 | 0 | File | 2016-07-28 14:00:47 | File-remote |
+---------+------------+-----------+---------+----------+----------+--------------+---------+------+-----------+-----------+---------------------+-------------+
Use :raw-latex:`\bcommand{update}{volume}` to set the right storage and
Use :strong:`update}{volume` to set the right storage and
check with list volumes that it worked:


Expand Down Expand Up @@ -735,10 +735,10 @@ case to make the incremental backups possible.
- Configure the Job that should backup the remote client with the
fileset.

- Run :raw-latex:`\bcommand{estimate}{listing}` on the remote backup
- Run :strong:`estimate}{listing` on the remote backup
job.

- Run :raw-latex:`\bcommand{list}{filesets}` to make sure the fileset
- Run :strong:`list}{filesets` to make sure the fileset
was added to the catalog.

Then we need to create a backup on the remote machine onto a portable
Expand Down

0 comments on commit 3c2310b

Please sign in to comment.