diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2006-11-21 19:14:10 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2006-11-21 19:14:10 +0000 |
| commit | defcb5dea55bec42e28ef9f2d1a72d87110177a9 (patch) | |
| tree | 37a706b25119c7a9166d4c6aa622820c35f5bdc3 | |
| parent | 40cbf65b21af36167c5898b5ae6ac92f996e0740 (diff) | |
Resolves: #216512
Summary: replica initialization: random failure (Comment #1)
Change: if acquire_replica is called for replica initialization, log REPLICA_BUSY.
| -rw-r--r-- | ldap/servers/plugins/replication/repl5_protocol_util.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/ldap/servers/plugins/replication/repl5_protocol_util.c b/ldap/servers/plugins/replication/repl5_protocol_util.c index 944e23e8..cb295b03 100644 --- a/ldap/servers/plugins/replication/repl5_protocol_util.c +++ b/ldap/servers/plugins/replication/repl5_protocol_util.c @@ -310,11 +310,25 @@ acquire_replica(Private_Repl_Protocol *prp, char *prot_oid, RUV **ruv) break; case NSDS50_REPL_REPLICA_BUSY: /* Someone else is updating the replica. Try later. */ - slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, - "%s: Unable to acquire replica: " - "the replica is currently being updated" - "by another supplier. Will try later\n", - agmt_get_long_name(prp->agmt)); + /* if acquire_replica is called for replica + initialization, log REPLICA_BUSY, too */ + if (strcmp(REPL_NSDS50_TOTAL_PROTOCOL_OID, + prot_oid) == 0) + { + slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, + "%s: Unable to acquire replica: " + "the replica is currently being updated" + "by another supplier.\n", + agmt_get_long_name(prp->agmt)); + } + else /* REPL_NSDS50_INCREMENTAL_PROTOCOL_OID */ + { + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, + "%s: Unable to acquire replica: " + "the replica is currently being updated" + "by another supplier. Will try later\n", + agmt_get_long_name(prp->agmt)); + } return_value = ACQUIRE_REPLICA_BUSY; break; case NSDS50_REPL_LEGACY_CONSUMER: |