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

v2 clear start attr from segment after initialization

Browse Source 
Online initialization can be triggered by setting "nsds5BeginReplicaRefresh[;left|;right]": start to a
    segment. But this field remained in the segment and after restart the init would be executed again.
    see Ticket #5065

    To fix this the field is cleared:
    - after a backend comes back online after being initialized
    - since there is a delay and the sending server could be restarted in between,
        the field is also scheced and renḿoved at startup

Reviewed-By: Thierry Bordaz <tbordaz@redhat.com>
This commit is contained in:
Ludwig Krispenz 2015-06-30 11:27:50 +02:00 committed by Tomas Babej
parent 0bf4e7fb4a
commit bb1f45b7f0
4 changed files with 130 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemons/ipa-slapi-plugins/topology/topology.h
View File

@ -123,6 +123,7 @@ typedef struct topo_plugin_config {
char **managed_attrs;
char **restricted_attrs;
int activated;
int post_init;
} TopoPluginConf;
#define CONFIG_ATTR_SHARED_BASE "nsslapd-topo-plugin-shared-config-base"
@ -138,6 +139,7 @@ void ipa_topo_init_shared_config(void);
int ipa_topo_init_config(Slapi_PBlock *pb);
void *ipa_topo_get_plugin_id(void);
int ipa_topo_get_plugin_active(void);
int ipa_topo_get_post_init(void);
char *ipa_topo_get_plugin_shared_config(void);
Slapi_DN *ipa_topo_get_plugin_shared_topo_dn(void);
Slapi_DN *ipa_topo_get_plugin_shared_hosts_dn(void);
@ -158,6 +160,7 @@ int ipa_topo_get_min_domain_level(void);
int ipa_topo_get_plugin_startup_delay(void);
void ipa_topo_set_plugin_id(void *plg_id);
void ipa_topo_set_plugin_active(int state);
void ipa_topo_set_post_init(int state);
void ipa_topo_set_plugin_shared_config(char *);
void ipa_topo_set_plugin_hostname(char *hostname);
void ipa_topo_set_plugin_replica_root(char **roots);
@ -296,3 +299,4 @@ char *ipa_topo_util_get_pluginhost(void);
TopoReplica *ipa_topo_util_get_replica_conf(char *repl_root);
TopoReplicaSegmentList *ipa_topo_util_get_replica_segments(TopoReplica *replica);
void ipa_topo_util_set_domain_level(void);
void ipa_topo_util_reset_init(char *repl_root);

12
daemons/ipa-slapi-plugins/topology/topology_cfg.c
View File

@ -171,6 +171,18 @@ ipa_topo_get_plugin_active(void)
return topo_plugin_conf.activated;
}
void
ipa_topo_set_post_init(int state)
{
topo_plugin_conf.post_init = state;
}
int
ipa_topo_get_post_init(void)
{
return topo_plugin_conf.post_init;
}
void
ipa_topo_set_plugin_shared_config(char *cfg)
{

13
daemons/ipa-slapi-plugins/topology/topology_init.c
View File

@ -160,6 +160,18 @@ ipa_topo_apply_shared_config(void)
/* initialize the list of managed servers */
rc = ipa_topo_setup_managed_servers();
if (ipa_topo_get_post_init()) {
/* this server has just been initialized, we reset the init
* flag in the segments which triggered this init
*/
i = 0;
while(shared_replica_root[i]) {
ipa_topo_util_reset_init(shared_replica_root[i]);
i++;
}
ipa_topo_set_post_init(0);
}
ipa_topo_release_startup_inprogress();
return (rc);
}
@ -295,6 +307,7 @@ ipa_topo_be_state_change(void *handle, char *be_name,
ipa_topo_util_set_domain_level();
ipa_topo_util_check_plugin_active();
if (ipa_topo_get_plugin_active()) {
ipa_topo_set_post_init(1);
ipa_topo_util_start(1);
}
} else if (new_be_state == SLAPI_BE_STATE_OFFLINE) {

102
daemons/ipa-slapi-plugins/topology/topology_util.c
View File

@ -471,6 +471,54 @@ ipa_topo_util_conf_from_entry(Slapi_Entry *entry)
return conf;
}
}
void
ipa_topo_util_segm_modify (TopoReplica *tconf,
TopoReplicaSegment *tsegm,
Slapi_Mods *smods)
{
char *dn = NULL;
dn = ipa_topo_segment_dn(tconf, tsegm->name);
if (dn == NULL) return;
if (slapi_mods_get_num_mods(smods) > 0) {
Slapi_DN *sdn = slapi_sdn_new_normdn_byref(dn);
ipa_topo_util_modify(sdn, smods);
slapi_sdn_free(&sdn);
}
slapi_ch_free_string(&dn);
}
void
ipa_topo_util_remove_init_attr(TopoReplica *repl_conf, TopoReplicaAgmt *topo_agmt)
{
TopoReplicaSegmentList *seglist = repl_conf->repl_segments;
TopoReplicaSegment *segment = NULL;
char *dirattr = NULL;
while (seglist) {
segment = seglist->segm;
if (segment->left == topo_agmt) {
dirattr = "nsds5beginreplicarefresh;left";
break;
} else if (segment->right == topo_agmt) {
dirattr = "nsds5beginreplicarefresh;right";
break;
} else {
segment = NULL;
}
seglist = seglist->next;
}
if (segment) {
Slapi_Mods *smods = slapi_mods_new();
slapi_mods_add_string(smods, LDAP_MOD_DELETE,
dirattr, "");
ipa_topo_util_segm_modify (repl_conf, segment, smods);
slapi_mods_free(&smods);
}
}
void
ipa_topo_util_set_agmt_rdn(TopoReplicaAgmt *topo_agmt, Slapi_Entry *repl_agmt)
@ -593,6 +641,14 @@ ipa_topo_util_update_agmt_list(TopoReplica *conf, TopoReplicaSegmentList *repl_s
for (i=0; mattrs[i]; i++) {
segm_attr_val = ipa_topo_util_get_segm_attr(topo_agmt,mattrs[i]);
if (segm_attr_val) {
if (0 == strcasecmp(mattrs[i], "nsds5BeginReplicaRefresh")) {
/* we have to remove this attr from the segment, this is
* processed on a server, which is the supplier side of
* an agreement.
*/
ipa_topo_util_remove_init_attr(conf, topo_agmt);
continue;
}
agmt_attr_val = slapi_entry_attr_get_charptr(repl_agmt,mattrs[i]);
if (agmt_attr_val == NULL ||
strcasecmp(agmt_attr_val,segm_attr_val)) {
@ -1558,5 +1614,49 @@ ipa_topo_util_disable_repl_for_principal(char *repl_root, char *principal)
slapi_sdn_free(&sdn);
slapi_log_error(SLAPI_LOG_PLUGIN, IPA_TOPO_PLUGIN_SUBSYSTEM,
"<-- ipa_topo_util_disable_repl_for_principal\n");
}
void
ipa_topo_util_reset_init(char *repl_root)
{
TopoReplica *replica_config = NULL;
TopoReplicaSegmentList *seglist = NULL;
TopoReplicaSegment *segment = NULL;
char *localhost = ipa_topo_get_plugin_hostname();
char *dirattr;
replica_config = ipa_topo_cfg_replica_find(repl_root, 1);
if (replica_config) {
seglist = ipa_topo_util_get_replica_segments(replica_config);
} else {
slapi_log_error(SLAPI_LOG_PLUGIN, IPA_TOPO_PLUGIN_SUBSYSTEM,
"ipa_topo_util_reset_init: no replica found for: %s\n", repl_root);
return;
}
while (seglist) {
/* this is executed after an online init completed, reset the init in segments
* which target this server
*/
segment = seglist->segm;
if (segment->left && (0 == strcasecmp(localhost,segment->left->target))
&& ipa_topo_util_get_segm_attr(segment->left,"nsds5BeginReplicaRefresh")) {
dirattr = "nsds5BeginReplicaRefresh;left";
break;
} else if (segment->right && (0 == strcasecmp(localhost,segment->right->target))
&& ipa_topo_util_get_segm_attr(segment->right,"nsds5BeginReplicaRefresh")) {
dirattr = "nsds5BeginReplicaRefresh;right";
break;
} else {
segment = NULL;
}
seglist = seglist->next;
}
if (segment) {
Slapi_Mods *smods = slapi_mods_new();
slapi_mods_add_string(smods, LDAP_MOD_DELETE,
dirattr, "");
ipa_topo_util_segm_modify (replica_config, segment, smods);
slapi_mods_free(&smods);
}
}