IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Accept 389-ds JSON replication status messages

Browse Source 
389-ds now stores a replication agreement status message in a JSON
string in a new attribute:

                  replicaLastInitStatusJSON
                  replicaLastUpdateStatusJSON

The original status attributes' values are not changing at this time,
but there are plans to do so eventually as the old status format is
confusing.

http://www.port389.org/docs/389ds/design/repl-agmt-status-design.html

Fixes: https://pagure.io/freeipa/issue/7975

Signed-off-by: Mark Reynolds <mreynolds@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Mark Reynolds
2019-06-14 11:16:43 -04:00
committed by Florence Blanc-Renaud
parent 3b007b7bba
commit daddcf6ec6
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ipaserver/install/replication.py
View File

@@ -28,6 +28,7 @@ import time
import datetime
import sys
import os
import json
from random import randint
import ldap
@@ -1058,6 +1059,7 @@ class ReplicationManager:
attrlist = ['cn', 'nsds5BeginReplicaRefresh',
'nsds5replicaUpdateInProgress',
'nsds5ReplicaLastInitStatus',
'nsds5ReplicaLastInitStatusJSON',
'nsds5ReplicaLastInitStart',
'nsds5ReplicaLastInitEnd']
entry = conn.get_entry(agmtdn, attrlist)
@@ -1068,7 +1070,14 @@ class ReplicationManager:
refresh = entry.single_value.get('nsds5BeginReplicaRefresh')
inprogress = entry.single_value.get('nsds5replicaUpdateInProgress')
status = entry.single_value.get('nsds5ReplicaLastInitStatus')
if not refresh: # done - check status
json_status = \
entry.single_value.get('nsds5ReplicaLastInitStatusJSON')
if not refresh: # done - check status
if json_status:
# Just reset status with the JSON 'message'
status_obj = json.loads(json_status)
status = status_obj['message']
if not status:
print("No status yet")
elif status.find("replica busy") > -1:
@@ -1099,8 +1108,11 @@ class ReplicationManager:
done = False
hasError = 0
error_message = ''
attrlist = ['cn', 'nsds5replicaUpdateInProgress',
'nsds5ReplicaLastUpdateStatus', 'nsds5ReplicaLastUpdateStart',
attrlist = ['cn',
'nsds5replicaUpdateInProgress',
'nsds5ReplicaLastUpdateStatus',
'nsds5ReplicaLastUpdateStatusjson',
'nsds5ReplicaLastUpdateStart',
'nsds5ReplicaLastUpdateEnd']
entry = conn.get_entry(agmtdn, attrlist)
if not entry:
@@ -1109,6 +1121,8 @@ class ReplicationManager:
else:
inprogress = entry.single_value.get('nsds5replicaUpdateInProgress')
status = entry.single_value.get('nsds5ReplicaLastUpdateStatus')
json_status = \
entry.single_value.get('nsds5ReplicaLastUpdateStatusjson')
try:
# nsds5ReplicaLastUpdateStart is either a GMT time
# ending with Z or 0 (see 389-ds ticket 47836)
@@ -1134,7 +1148,15 @@ class ReplicationManager:
logger.info("Replication Update in progress: %s: status: %s: "
"start: %d: end: %d",
inprogress, status, start, end)
if status: # always check for errors
if json_status:
# In 389-ds-base 1.4.1.4 we have the status message available
# to us in a json object
status_obj = json.loads(json_status)
if status_obj['state'] != 'green':
hasError = 1
error_message = status_obj['message']
done = True
elif status: # always check for errors
# status will usually be a number followed by a string
# number != 0 means error
# Since 389-ds-base 1.3.5 it is 'Error (%d) %s'