This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.0
in repository 389-ds-base.
The following commit(s) were added to refs/heads/389-ds-base-1.4.0 by this push:
new ff5b4fd Ticket 50413 - ds-replcheck - Always display the Result Summary
ff5b4fd is described below
commit ff5b4fd648d783b5e3f562054d10b7b86db401d8
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Thu May 30 15:38:27 2019 -0400
Ticket 50413 - ds-replcheck - Always display the Result Summary
Description: Previously we only printed a "Result Summary" if there
were no inconsistencies and the entry counts matched.
However, the entry counts do not need to match. So
this made the "Result Summary" checks too strict, and
if things were out of sync there was no Result Summary
printed at all. This fix just always prints a result
summary and it removes the entry count check.
https://pagure.io/389-ds-base/issue/50413
Reviewed by: spichugi(Thanks!)
(cherry picked from commit 423a7ba01ed3bad52c8caa6a20267f2335b3c69f)
---
ldap/admin/src/scripts/ds-replcheck | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/ldap/admin/src/scripts/ds-replcheck b/ldap/admin/src/scripts/ds-replcheck
index 5d7295e..4abb417 100755
--- a/ldap/admin/src/scripts/ds-replcheck
+++ b/ldap/admin/src/scripts/ds-replcheck
@@ -661,14 +661,14 @@ def do_offline_report(opts, output_file=None):
MLDIF = open(opts['mldif'], "r")
except Exception as e:
print('Failed to open Master LDIF: ' + str(e))
- return None
+ return
try:
RLDIF = open(opts['rldif'], "r")
except Exception as e:
print('Failed to open Replica LDIF: ' + str(e))
MLDIF.close()
- return None
+ return
# Verify LDIF Files
try:
@@ -679,7 +679,7 @@ def do_offline_report(opts, output_file=None):
print('Master LDIF file in invalid, aborting...')
MLDIF.close()
RLDIF.close()
- return None
+ return
try:
if opts['verbose']:
print("Validating Replica ldif file
({})...".format(opts['rldif']))
@@ -688,7 +688,7 @@ def do_offline_report(opts, output_file=None):
print('Replica LDIF file is invalid, aborting...')
MLDIF.close()
RLDIF.close()
- return None
+ return
# Get all the dn's, and entry counts
if opts['verbose']:
@@ -845,10 +845,13 @@ def do_offline_report(opts, output_file=None):
final_report +=
('=====================================================\n\n')
for diff in diff_report:
final_report += ('%s\n' % (diff))
- if missing_report == "" and len(diff_report) == 0 and m_count == r_count:
- final_report += ('\nResult\n')
- final_report +=
('=====================================================\n\n')
- final_report += ('No differences between Master and Replica\n')
+
+ final_report += ('\nResult\n')
+ final_report +=
('=====================================================\n\n')
+ if missing_report == "" and len(diff_report) == 0:
+ final_report += ('No replication differences between Master and
Replica\n')
+ else:
+ final_report += ('There are replication differences between Master and
Replica\n')
if output_file:
output_file.write(final_report)
@@ -1130,10 +1133,12 @@ def print_online_report(report, opts, output_file):
for diff in report['diff']:
final_report += ('%s\n' % (diff))
- if not missing and len(report['diff']) == 0 and report['m_count'] ==
report['r_count']:
- final_report += ('\nResult\n')
- final_report +=
('=====================================================\n\n')
- final_report += ('No differences between Master and Replica\n')
+ final_report += ('\nResult\n')
+ final_report +=
('=====================================================\n\n')
+ if not missing and len(report['diff']) == 0:
+ final_report += ('No replication differences between Master and
Replica\n')
+ else:
+ final_report += ('There are replication differences between Master and
Replica\n')
if output_file:
output_file.write(final_report)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.