diff --git a/gpdb-doc/dita/GPRefGuide.ditamap b/gpdb-doc/dita/GPRefGuide.ditamap index d13c68d534634036a06d02932f57f2dfaef46d30..1fda6ec853047f74d8ebce8555f7d2b4f95777f5 100644 --- a/gpdb-doc/dita/GPRefGuide.ditamap +++ b/gpdb-doc/dita/GPRefGuide.ditamap @@ -211,7 +211,6 @@ - diff --git a/gpdb-doc/dita/admin_guide/expand/expand-initialize.xml b/gpdb-doc/dita/admin_guide/expand/expand-initialize.xml index 06ce3f6896379fc83b3802fac9df11891393be04..43c5cb3395626daa662da7b7b51561bb1493531e 100644 --- a/gpdb-doc/dita/admin_guide/expand/expand-initialize.xml +++ b/gpdb-doc/dita/admin_guide/expand/expand-initialize.xml @@ -116,12 +116,12 @@

Use the interactive interview process to create your own input file unless your expansion scenario has atypical needs.

The format for expansion input files is:

- hostname:address:port:fselocation:dbid:content:preferred_role:replication_port + hostname:address:port:datadir:dbid:content:preferred_role

For example:

- sdw5:sdw5-1:50011:/gpdata/primary/gp9:11:9:p:53011 -sdw5:sdw5-2:50012:/gpdata/primary/gp10:12:10:p:53011 -sdw5:sdw5-2:60011:/gpdata/mirror/gp9:13:9:m:63011 -sdw5:sdw5-1:60012:/gpdata/mirror/gp10:14:10:m:63011 + sdw5:sdw5-1:50011:/gpdata/primary/gp9:11:9:p +sdw5:sdw5-2:50012:/gpdata/primary/gp10:12:10:p +sdw5:sdw5-2:60011:/gpdata/mirror/gp9:13:9:m +sdw5:sdw5-1:60012:/gpdata/mirror/gp10:14:10:m

For each new segment, this format of expansion input file requires the following:

Data for the expansion configuration file @@ -149,10 +149,10 @@ sdw5:sdw5-1:60012:/gpdata/mirror/gp10:14:10:m:63011 existing segment port base number. - fselocation + datadir Directory name - The data directory (filespace) location for a segment as per - the pg_filespace_entry system catalog. + The data directory location for a segment as per + the gp_segment_configuration system catalog. dbid @@ -181,12 +181,6 @@ sdw5:sdw5-1:60012:/gpdata/mirror/gp10:14:10:m:63011 Determines whether this segment is a primary or mirror. Specify p for primary and m for mirror. - - replication_port - An available port number - File replication port for the segment, incremented on the - existing segment replication_port base number. -
diff --git a/gpdb-doc/dita/admin_guide/monitoring.dita b/gpdb-doc/dita/admin_guide/monitoring.dita index 3f6409fd62fa1acb660b0c0ea6b6d87f0c0ebda9..a3953f17fc4ef974da4c15335767dcb1a384ccd5 100644 --- a/gpdb-doc/dita/admin_guide/monitoring.dita +++ b/gpdb-doc/dita/admin_guide/monitoring.dita @@ -323,18 +323,6 @@ WHERE logseverity in ('FATAL', 'ERROR') database:gpcheckcat -O Run repair scripts for any issues detected. - -
Check persistent table catalog - - Run a persistent table catalog check.

Recommended frequency: - monthly

Severity -CRITICAL - During a downtime, with no users on the system, run the Greenplum - gpcheckcat utility in each - database:gpcheckcat -R persistent - If any problems are identified, contact Pivotal support for - assistance. -
diff --git a/gpdb-doc/dita/ref_guide/ref_guide.ditamap b/gpdb-doc/dita/ref_guide/ref_guide.ditamap index c4b92909527aa27efd634f097537d6656f1bc316..7b40fce882007e226135d27f9913c2d9fddb4e05 100644 --- a/gpdb-doc/dita/ref_guide/ref_guide.ditamap +++ b/gpdb-doc/dita/ref_guide/ref_guide.ditamap @@ -148,7 +148,6 @@ - diff --git a/gpdb-doc/dita/ref_guide/system_catalogs/catalog_ref-tables.xml b/gpdb-doc/dita/ref_guide/system_catalogs/catalog_ref-tables.xml index 91b2912a8936cc22cad4beb49163d4e0222f2164..a45bc36d65672f95e43db00284715cb985151faa 100644 --- a/gpdb-doc/dita/ref_guide/system_catalogs/catalog_ref-tables.xml +++ b/gpdb-doc/dita/ref_guide/system_catalogs/catalog_ref-tables.xml @@ -25,21 +25,6 @@
  • gp_master_mirroring (Deprecated. See .)
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • @@ -105,12 +90,6 @@
    • -
  • - -
    • -
  • - -
  • pg_foreign_data_wrapper (not supported)
  • pg_foreign_server (not supported)
  • pg_foreign_table (not supported)
    • diff --git a/gpdb-doc/dita/ref_guide/system_catalogs/gp_relation_node.xml b/gpdb-doc/dita/ref_guide/system_catalogs/gp_relation_node.xml deleted file mode 100644 index b24ab1afbdc043f7325739e3d75f774a157ead46..0000000000000000000000000000000000000000 --- a/gpdb-doc/dita/ref_guide/system_catalogs/gp_relation_node.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - gp_relation_node - -

    The gp_relation_node table contains information about the file system - objects for a relation (table, view, index, and so on).

    - - pg_catalog.gp_relation_node - - - - - - - - column - type - references - description - - - - - - relfilenode_oid - - oid - pg_class.relfilenode - The object id of the relation file node. - - - - segment_file_num - - integer - - For append-optimized tables, the append-optimized segment file - number. - - - - persistent_tid - - tid - - Used by Greenplum Database to internally manage - persistent representations of file system objects. - - - - persistent_serial_num - - bigint - - Log sequence number position in the transaction log for a file - block. - - - -
    - -     diff --git a/gpdb-doc/dita/utility_guide/admin_utilities/gpaddmirrors.xml b/gpdb-doc/dita/utility_guide/admin_utilities/gpaddmirrors.xml index 5e032990ca86c7f3c51256331793fc1941628043..ab8af08c7b4921426006c668c683dfc55d74eb5f 100644 --- a/gpdb-doc/dita/utility_guide/admin_utilities/gpaddmirrors.xml +++ b/gpdb-doc/dita/utility_guide/admin_utilities/gpaddmirrors.xml @@ -60,8 +60,7 @@ mirror1=1:sdw1-1:60001:/gpdata/mir2/gp1

    The gp_segment_configuration system catalog table can help you determine your current primary segment configuration so that you can plan your mirror segment configuration. For example, run the following query:

    - =# SELECT dbid, content, address as host_address, port, -   replication_port, datadir + =# SELECT dbid, content, address as host_address, port, datadir    FROM gp_segment_configuration    ORDER BY dbid;

    If creating your mirrors on alternate mirror hosts, the new mirror segment hosts must @@ -107,7 +106,7 @@ mirror1=1:sdw1-1:60001:/gpdata/mir2/gp1 the system. The format of this file is as follows (as per attributes in the gp_segment_configuration catalog table): - mirror[content]=content:address:port:fselocation + mirror[content]=content:address:port: @@ -140,15 +139,12 @@ mirror1=1:sdw1-1:60001:/gpdata/mir2/gp1 -p port_offset - Optional. This number is used to calculate the database ports and - replication ports used for mirror segments. The default offset is 1000. + Optional. This number is used to calculate the database ports + used for mirror segments. The default offset is 1000. Mirror port assignments are calculated as follows: primary port + offset = mirror database port - primary port + (2 * offset) = mirror replication port - primary port + (3 * offset) = primary replication port For example, if a primary segment has port 50001, then its mirror will use a - database port of 51001, a mirror replication port of 52001, and a primary - replication port of 53001 by default. + database port of 51001, by default. -s (spread mirrors) @@ -176,7 +172,7 @@ mirror1=1:sdw1-1:60001:/gpdata/mir2/gp1

    Examples

    Add mirroring to an existing Greenplum Database system using the same set of hosts as - your primary data. Calculate the mirror database and replication ports by adding 100 + your primary data. Calculate the mirror database ports by adding 100 to the current primary segment port numbers:

    $ gpaddmirrors -p 100

    Add mirroring to an existing Greenplum Database system using a different set of hosts @@ -184,9 +180,9 @@ mirror1=1:sdw1-1:60001:/gpdata/mir2/gp1 $ gpaddmirrors -i mirror_config_file

    Where mirror_config_file looks something like this:

    mirror0=0:sdw1-1:52001:53001:54001:/gpdata/mir1/gp0 -mirror1=1:sdw1-2:52002:53002:54002:/gpdata/mir2/gp1 -mirror2=2:sdw2-1:52001:53001:54001:/gpdata/mir1/gp2 -mirror3=3:sdw2-2:52002:53002:54002:/gpdata/mir2/gp3 +mirror1=1:sdw1-2:52002:/gpdata/mir2/gp1 +mirror2=2:sdw2-1:52001:/gpdata/mir1/gp2 +mirror3=3:sdw2-2:52002:/gpdata/mir2/gp3

    Output a sample mirror configuration file to use with gpaddmirrors -i:

    $ gpaddmirrors -o /home/gpadmin/sample_mirror_config diff --git a/gpdb-doc/dita/utility_guide/admin_utilities/gpcheckcat.xml b/gpdb-doc/dita/utility_guide/admin_utilities/gpcheckcat.xml index 6bcddc0623cdfedf1813b79fd99523df512e42a2..0402c54d33ceff5599d044ba400374d5790cb4a1 100644 --- a/gpdb-doc/dita/utility_guide/admin_utilities/gpcheckcat.xml +++ b/gpdb-doc/dita/utility_guide/admin_utilities/gpcheckcat.xml @@ -53,12 +53,8 @@ is missing row on one segment, but other segments have this row. As another example, the values of specific row column data are different across segments, such as table owner or table access privileges. -
  • Persistent Table inconsistencies are inconsistencies in persistence object state and - file system objects on a segment. For example, there are no running transactions, all - transactions are complete, but there is object that is marked as creation - incomplete in persistent tables. As another example, a file exists in - database directory, but there is no corresponding object existing in the database system - tables.
    • +
  • Inconsistency between a catalog table and the filesystem. For example, a file exists in + database directory, but there is no entry for it in the pg_class table.

    • @@ -117,28 +113,21 @@ Specify a test to run. Some tests can be run only when Greenplum Database is in restricted mode. - These are the tests that can be performed:

    acl - Cross consistency - check for access control privileges

    duplicate - Check for - duplicate entries

    duplicate_persistent - Check for duplicate - gp_persistent_relation_node entries

    foreign_key - - Check foreign keys

    inconsistent - Cross consistency check for - master segment inconsistency

    mirroring_matching - Checks if - mirroring is consistent (either enabled or disabled) for the cluster and - segments.

    missing_extraneous - Cross consistency check for - missing or extraneous entries

    owner - Check table ownership - that is inconsistent with the master database

    part_integrity - - Check pg_partition branch integrity, partition with OIDs, partition - distribution policy

    part_constraint - Check constraints on - partitioned tables

    unique_index_violation - Check tables that - have columns with the unique index constraint for duplicate - entries

    dependency - Check for dependency on non-existent - objects (restricted mode only)

    distribution_policy - Check - constraints on randomly distributed tables (restricted mode - only)

    namespace - Check for schemas with a missing schema - definition (restricted mode only)

    persistent - Check persistent - tables (restricted mode only)

    pgclass - Check pg_class - entry that does not have any corresponding pg_attribute entry (restricted mode - only)

     + These are the tests that can be performed: +

    acl - Cross consistency check for access control privileges

    +

    duplicate - Check for duplicate entries

    +

    foreign_key - Check foreign keys

    +

    inconsistent - Cross consistency check for master segment inconsistency

    +

    missing_extraneous - Cross consistency check for missing or extraneous entries

    +

    owner - Check table ownership that is inconsistent with the master database

    +

    part_integrity - Check pg_partition branch integrity, partition with OIDs, partition distribution policy

    +

    part_constraint - Check constraints on partitioned tables

    +

    unique_index_violation - Check tables that have columns with the unique index constraint for duplicate entries

    +

    dependency - Check for dependency on non-existent objects (restricted mode only)

    +

    distribution_policy - Check constraints on randomly distributed tables (restricted mode only)

    +

    namespace - Check for schemas with a missing schema definition (restricted mode only)

    +

    pgclass - Check pg_class entry that does not have any corresponding pg_attribute entry (restricted mode only)

    +     -S {none | only} diff --git a/gpdb-doc/dita/utility_guide/admin_utilities/gprecoverseg.xml b/gpdb-doc/dita/utility_guide/admin_utilities/gprecoverseg.xml index f6da23496eff80737d1db4231fc07c9735dfbe7c..19da5a09048e749a6ce8b0c8447e838baaa3ecf8 100644 --- a/gpdb-doc/dita/utility_guide/admin_utilities/gprecoverseg.xml +++ b/gpdb-doc/dita/utility_guide/admin_utilities/gprecoverseg.xml @@ -56,15 +56,14 @@ The word SPACE indicates the location of a required space. Do not add additional spaces.

    <failed_host_address>:<port>:<data_directory>SPACE -<recovery_host_address>:<port>:<replication_port>:<data_directory> -[:<fselocation>:...] +<recovery_host_address>:<port>:<data_directory> +

    See the -i option below for details and examples of a recovery configuration file.

    The gp_segment_configuration system catalog table can help you determine your current segment configuration so that you can plan your mirror recovery configuration. For example, run the following query:

    - =# SELECT dbid, content, address, port, -   replication_port, datadir + =# SELECT dbid, content, address, port, datadir    FROM gp_segment_configuration    ORDER BY dbid;

    The new recovery segment host must be pre-installed with the Greenplum Database software @@ -107,8 +106,8 @@ line in the file is in the following format. The word SPACE indicates the location of a required space. Do not add additional spaces.<failed_host_address>:<port>:<data_directory>SPACE -<recovery_host_address>:<port>:<replication_port>:<data_directory> -[:<fselocation>:...]

    Comments

    Lines +<recovery_host_address>:<port>:<data_directory> +

    Comments

    Lines beginning with # are treated as comments and ignored.

    Segments to Recover

    Each line after the first specifies a segment to @@ -119,13 +118,13 @@ in the line. The required space is indicated by SPACE. Do not add additional spaces.

    failedAddress:failedPort:failedDataDirectorySPACEnewAddress: -newPort:newReplicationPort:newDataDirectory +newPort:newDataDirectory

    Examples

    In-place recovery of a single mirror

    sdw1-1:50001:/data1/mirror/gpseg16

    Recovery of a single mirror to a new host

    - sdw1-1:50001:/data1/mirror/gpseg16SPACEsdw4-1:50001:51001:/data1/recover1/gpseg16 + sdw1-1:50001:/data1/mirror/gpseg16SPACEsdw4-1:50001:/data1/recover1/gpseg16

    Obtaining a Sample File

    You can use the -o option to output a sample recovery configuration file to use as a starting point.

    diff --git a/src/test/tinc/tincrepo/mpp/lib/gprecoverseg.py b/src/test/tinc/tincrepo/mpp/lib/gprecoverseg.py index 544e935974ec59437753f3dd78ce6317cdec06ac..475147dfecb9bec055a218c776462a26027cc98f 100644 --- a/src/test/tinc/tincrepo/mpp/lib/gprecoverseg.py +++ b/src/test/tinc/tincrepo/mpp/lib/gprecoverseg.py @@ -34,7 +34,7 @@ class GpRecoverseg(): self.stderr = None def run_using_workerpool(self, option=''): - if not (set(option.split()) <= set(['-F' , '-r', '--persistent-check', ' '])): + if not (set(option.split()) <= set(['-F' , '-r', ' '])): raise GpRecoversegException('Not a valid option with gprecoverseg') rcvr_cmd = 'gprecoverseg -a %s' % option @@ -49,7 +49,7 @@ class GpRecoverseg(): @type option: string @param option: gprecoverseg option (-F or -r) ''' - if not (set(option.split()) <= set(['-F' , '-r', '--persistent-check', ' '])): + if not (set(option.split()) <= set(['-F' , '-r', ' '])): raise GpRecoversegException('Not a valid option with gprecoverseg') rcvr_cmd = 'gprecoverseg -a %s' % option cmd = Command(name='Run gprecoverseg', cmdStr='source %s/greenplum_path.sh;%s' % (self.gphome, rcvr_cmd))