Masato Taruishi
taru****@users*****
2005年 1月 25日 (火) 20:35:24 JST
===================================================================
RCS file: plugin/slapd/upstream/syncbackup-2.2.20.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin/slapd/upstream/syncbackup-2.2.20.patch 2005/01/11 09:52:22 1.1
+++ plugin/slapd/upstream/syncbackup-2.2.20.patch 2005/01/25 11:35:24 1.2
@@ -2,16 +2,16 @@
===================================================================
RCS file: /cvsroot/openldap-ha/build-tree/openldap-2.2.20/build/version.var,v
retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
+retrieving revision 1.3
+diff -u -r1.1.1.1 -r1.3
--- openldap-2.2.20/build/version.var 11 Jan 2005 06:53:26 -0000 1.1.1.1
-+++ openldap-2.2.20/build/version.var 11 Jan 2005 07:58:45 -0000 1.2
++++ openldap-2.2.20/build/version.var 25 Jan 2005 11:31:38 -0000 1.3
@@ -15,7 +15,7 @@
ol_package=OpenLDAP
ol_major=2
ol_minor=2
-ol_patch=20
-+ol_patch=20sb1
++ol_patch=20sb2
ol_api_inc=20220
ol_api_current=7
ol_api_revision=13
@@ -1884,8 +1884,8 @@
RCS file: openldap-2.2.20/servers/slapd/syncbackup.c
diff -N openldap-2.2.20/servers/slapd/syncbackup.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ openldap-2.2.20/servers/slapd/syncbackup.c 11 Jan 2005 07:59:26 -0000 1.1
-@@ -0,0 +1,2966 @@
++++ openldap-2.2.20/servers/slapd/syncbackup.c 25 Jan 2005 11:15:31 -0000 1.2
+@@ -0,0 +1,2969 @@
+/* $OpenLDAP:$ */
+/*
+ * Synchronized Backup Engine
@@ -2521,7 +2521,7 @@
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1, "syncbackup: id=%s delayed: %d\n", info->sbi_backups[i]->sb_syncid, history_backup_latency( be, i ), 0);
+#else
-+ Debug ( LDAP_DEBUG_TRACE, "syncbackup: id=%s delayed: %d\n", info->sbi_backups[i]->sb_syncid, history_backup_latency( be, i ), 0);
++ Debug ( LDAP_DEBUG_TRACE, "syncbackup: id=%s delayed: %d\n", info->sbi_backups[i]->sb_syncid, history_backup_latency( be, i ), 0);
+#endif
+ } else {
+ atleast++;
@@ -2838,9 +2838,9 @@
+ }
+ } else {
+#ifdef NEW_LOGGING
-+ LDAP_LOG ( OPERATION, ERR, "backup_result: err from id=%s \"%s, %s\"\n", info->sbi_backups[id]->sb_syncid, ldap_err2string(err), errstr );
++ LDAP_LOG ( OPERATION, DETAIL1, "backup_result: err from id=%s \"%s, %s\"\n", info->sbi_backups[id]->sb_syncid, ldap_err2string(err), errstr );
+#else
-+ Debug ( LDAP_DEBUG_ANY, "backup_result: err from id=%s \"%s, %s\"\n", info->sbi_backups[id]->sb_syncid, ldap_err2string(err), errstr );
++ Debug ( LDAP_DEBUG_TRACE, "backup_result: err from id=%s \"%s, %s\"\n", info->sbi_backups[id]->sb_syncid, ldap_err2string(err), errstr );
+#endif
+ if( backup_recovery( be, id, err ) != LDAP_SUCCESS ) {
+ backup_call_cb( info, id, err, errstr, SYNC_ERROR );
@@ -2875,7 +2875,8 @@
+ int rc = err;
+ syncbackupinfo_t *info = be->be_syncbackupinfo;
+ LDAPMod **mods;
-+ event_t *ev = info->sbi_backups[id]->sb_age, ev_next;
++ event_t *ev = LDAP_STAILQ_NEXT( info->sbi_backups[id]->sb_age, ev_next );
++ event_t ev_next;
+
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1, "backup_recovery\n", 0, 0, 0);
@@ -2883,6 +2884,8 @@
+ Debug ( LDAP_DEBUG_TRACE, "=>backup_recovery\n", 0, 0, 0);
+#endif
+
++ Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu RECOVERY latency=%d backup=\"%s\"\n", ev->ev_connid, ev->ev_opid, history_backup_latency( be, id ), info->sbi_backups[id]->sb_syncid, 0 );
++
+ switch( err ) {
+
+ case LDAP_NO_SUCH_OBJECT:
@@ -2910,9 +2913,9 @@
+
+retry:
+#ifdef NEW_LOGGING
-+ LDAP_LOG ( OPERATION, ERR, "backup retry: id=%s\n", info->sbi_backups[id]->sb_syncid, 0, 0 );
++ LDAP_LOG ( OPERATION, DETAIL1, "backup retry: id=%s\n", info->sbi_backups[id]->sb_syncid, 0, 0 );
+#else
-+ Debug ( LDAP_DEBUG_ANY, "backup_retry: id=%s\n", info->sbi_backups[id]->sb_syncid, 0, 0 );
++ Debug ( LDAP_DEBUG_TRACE, "backup_retry: id=%s\n", info->sbi_backups[id]->sb_syncid, 0, 0 );
+#endif
+ info->sbi_backups[id]->sb_msgid = -1;
+