From 187af35150d234ff03773e9001b5ee8de6586a79 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 27 Jan 2012 14:51:13 +0000 Subject: main/db: upgrade to 5.3.15 and split out -utils subpackage --- main/db/APKBUILD | 17 ++- main/db/patch.4.7.25.1 | 75 ------------ main/db/patch.4.7.25.2 | 71 ----------- main/db/patch.4.7.25.3 | 314 ------------------------------------------------- main/db/patch.4.7.25.4 | 183 ---------------------------- 5 files changed, 12 insertions(+), 648 deletions(-) delete mode 100644 main/db/patch.4.7.25.1 delete mode 100644 main/db/patch.4.7.25.2 delete mode 100644 main/db/patch.4.7.25.3 delete mode 100644 main/db/patch.4.7.25.4 (limited to 'main/db') diff --git a/main/db/APKBUILD b/main/db/APKBUILD index fc51b1518a..74bd952598 100644 --- a/main/db/APKBUILD +++ b/main/db/APKBUILD @@ -1,18 +1,18 @@ # Maintainer: Natanael Copa pkgname=db -pkgver=5.2.36 +pkgver=5.3.15 _ver=${pkgver} pkgrel=0 -pkgdesc="The Berkeley DB embedded database system 4.8" +pkgdesc="The Berkeley DB embedded database system" url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" arch="all" license="custom" depends= makedepends= -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" # Patches were found here: # http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.html -source="http://download-uk.oracle.com/berkeley-db/db-$_ver.tar.gz +source="http://download.oracle.com/berkeley-db/db-$pkgver.tar.gz " build () { @@ -45,4 +45,11 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="88466dd6c13d5d8cddb406be8a1d4d92 db-5.2.36.tar.gz" +utils() { + pkgdesc="Utils for The Berkeley DB embedded database system" + replaces="db" + mkdir -p "$subpkgdir"/usr/ + mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ +} + +md5sums="5493fb5f7cc3915887c836b096f18773 db-5.3.15.tar.gz" diff --git a/main/db/patch.4.7.25.1 b/main/db/patch.4.7.25.1 deleted file mode 100644 index 3c7e23ce07..0000000000 --- a/main/db/patch.4.7.25.1 +++ /dev/null @@ -1,75 +0,0 @@ -*** sequence/sequence.c.orig 2008-05-05 13:25:09.000000000 -0700 ---- sequence/sequence.c 2008-08-15 09:58:46.000000000 -0700 -*************** -*** 187,193 **** - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! if (DB_IS_READONLY(dbp)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } ---- 187,197 ---- - if ((ret = __db_get_flags(dbp, &tflags)) != 0) - goto err; - -! /* -! * We can let replication clients open sequences, but must -! * check later that they do not update them. -! */ -! if (F_ISSET(dbp, DB_AM_RDONLY)) { - ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); - goto err; - } -*************** -*** 244,249 **** ---- 248,258 ---- - if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || - !LF_ISSET(DB_CREATE)) - goto err; -+ if (IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->open"); -+ goto err; -+ } - ret = 0; - - rp = &seq->seq_record; -*************** -*** 296,302 **** - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = ---- 305,316 ---- - */ - rp = seq->seq_data.data; - if (rp->seq_version == DB_SEQUENCE_OLDVER) { -! oldver: if (IS_REP_CLIENT(env) && -! !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -! ret = __db_rdonly(env, "DB_SEQUENCE->open"); -! goto err; -! } -! rp->seq_version = DB_SEQUENCE_VERSION; - if (!F_ISSET(env, ENV_LITTLEENDIAN)) { - if (IS_DB_AUTO_COMMIT(dbp, txn)) { - if ((ret = -*************** -*** 707,712 **** ---- 721,733 ---- - - MUTEX_LOCK(env, seq->mtx_seq); - -+ if (handle_check && IS_REP_CLIENT(env) && -+ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { -+ ret = __db_rdonly(env, "DB_SEQUENCE->get"); -+ goto err; -+ } -+ -+ - if (rp->seq_min + delta > rp->seq_max) { - __db_errx(env, "Sequence overflow"); - ret = EINVAL; diff --git a/main/db/patch.4.7.25.2 b/main/db/patch.4.7.25.2 deleted file mode 100644 index 1f42dcec71..0000000000 --- a/main/db/patch.4.7.25.2 +++ /dev/null @@ -1,71 +0,0 @@ -Index: lock/lock.c -=================================================================== -RCS file: /a/CVSROOT/db/lock/lock.c,v -retrieving revision 12.61 -diff -c -r12.61 lock.c -*** lock/lock.c 22 Jul 2008 12:08:53 -0000 12.61 ---- lock/lock.c 19 Aug 2008 17:28:24 -0000 -*************** -*** 1278,1287 **** - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -! LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -! LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); ---- 1278,1289 ---- - SH_TAILQ_REMOVE( - <->obj_tab[obj_ndx], sh_obj, links, __db_lockobj); - if (sh_obj->lockobj.size > sizeof(sh_obj->objdata)) { -! if (region->part_t_size != 1) -! LOCK_REGION_LOCK(env); - __env_alloc_free(<->reginfo, - SH_DBT_PTR(&sh_obj->lockobj)); -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - } - SH_TAILQ_INSERT_HEAD( - &FREE_OBJS(lt, part_id), sh_obj, links, __db_lockobj); -*************** -*** 1470,1484 **** - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -! LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -! LOCK_REGION_UNLOCK(env); - goto err; - } -! LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); ---- 1472,1492 ---- - if (obj->size <= sizeof(sh_obj->objdata)) - p = sh_obj->objdata; - else { -! /* -! * If we have only one partition, the region is locked. -! */ -! if (region->part_t_size != 1) -! LOCK_REGION_LOCK(env); - if ((ret = - __env_alloc(<->reginfo, obj->size, &p)) != 0) { - __db_errx(env, - "No space for lock object storage"); -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - goto err; - } -! if (region->part_t_size != 1) -! LOCK_REGION_UNLOCK(env); - } - - memcpy(p, obj->data, obj->size); diff --git a/main/db/patch.4.7.25.3 b/main/db/patch.4.7.25.3 deleted file mode 100644 index b58a43074f..0000000000 --- a/main/db/patch.4.7.25.3 +++ /dev/null @@ -1,314 +0,0 @@ -*** lock/lock_deadlock.c 2008-03-11 00:31:33.000000000 +1100 ---- lock/lock_deadlock.c 2008-12-16 21:54:18.000000000 +1100 -*************** -*** 121,127 **** - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -! u_int32_t *bitmap, *copymap, **deadp, **free_me, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; ---- 121,127 ---- - DB_LOCKTAB *lt; - db_timespec now; - locker_info *idmap; -! u_int32_t *bitmap, *copymap, **deadp, **deadlist, *tmpmap; - u_int32_t i, cid, keeper, killid, limit, nalloc, nlockers; - u_int32_t lock_max, txn_max; - int ret, status; -*************** -*** 133,139 **** - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -! free_me = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) ---- 133,140 ---- - if (IS_REP_CLIENT(env)) - atype = DB_LOCK_MINWRITE; - -! copymap = tmpmap = NULL; -! deadlist = NULL; - - lt = env->lk_handle; - if (rejectp != NULL) -*************** -*** 179,189 **** - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -! goto err1; - - /* Find a deadlock. */ - if ((ret = -! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadp)) != 0) - return (ret); - - /* ---- 180,190 ---- - memcpy(copymap, bitmap, nlockers * sizeof(u_int32_t) * nalloc); - - if ((ret = __os_calloc(env, sizeof(u_int32_t), nalloc, &tmpmap)) != 0) -! goto err; - - /* Find a deadlock. */ - if ((ret = -! __dd_find(env, bitmap, idmap, nlockers, nalloc, &deadlist)) != 0) - return (ret); - - /* -*************** -*** 204,211 **** - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -! free_me = deadp; -! for (; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; ---- 205,211 ---- - txn_max = TXN_MAXIMUM; - - killid = BAD_KILLID; -! for (deadp = deadlist; *deadp != NULL; deadp++) { - if (rejectp != NULL) - ++*rejectp; - killid = (u_int32_t)(*deadp - bitmap) / nalloc; -*************** -*** 342,352 **** - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -! __os_free(env, tmpmap); -! err1: __os_free(env, copymap); -! -! err: if (free_me != NULL) -! __os_free(env, free_me); - __os_free(env, bitmap); - __os_free(env, idmap); - ---- 342,353 ---- - __db_msg(env, - "Aborting locker %lx", (u_long)idmap[killid].id); - } -! err: if(copymap != NULL) -! __os_free(env, copymap); -! if (deadlist != NULL) -! __os_free(env, deadlist); -! if(tmpmap != NULL) -! __os_free(env, tmpmap); - __os_free(env, bitmap); - __os_free(env, idmap); - -*************** -*** 360,365 **** ---- 361,377 ---- - - #define DD_INVALID_ID ((u_int32_t) -1) - -+ /* -+ * __dd_build -- -+ * Build the lock dependency bit maps. -+ * Notes on syncronization: -+ * LOCK_SYSTEM_LOCK is used to hold objects locked when we have -+ * a single partition. -+ * LOCK_LOCKERS is held while we are walking the lockers list and -+ * to single thread the use of lockerp->dd_id. -+ * LOCK_DD protects the DD list of objects. -+ */ -+ - static int - __dd_build(env, atype, bmp, nlockers, allocp, idmap, rejectp) - ENV *env; -*************** -*** 393,398 **** ---- 405,411 ---- - * In particular we do not build the conflict array and our caller - * needs to expect this. - */ -+ LOCK_SYSTEM_LOCK(lt, region); - if (atype == DB_LOCK_EXPIRE) { - skip: LOCK_DD(env, region); - op = SH_TAILQ_FIRST(®ion->dd_objs, __db_lockobj); -*************** -*** 430,446 **** - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); - goto done; - } - - /* -! * We'll check how many lockers there are, add a few more in for -! * good measure and then allocate all the structures. Then we'll -! * verify that we have enough room when we go back in and get the -! * mutex the second time. - */ -! retry: count = region->stat.st_nlockers; - if (count == 0) { - *nlockers = 0; - return (0); - } ---- 443,460 ---- - OBJECT_UNLOCK(lt, region, indx); - } - UNLOCK_DD(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - goto done; - } - - /* -! * Allocate after locking the region -! * to make sure the structures are large enough. - */ -! LOCK_LOCKERS(env, region); -! count = region->stat.st_nlockers; - if (count == 0) { -+ UNLOCK_LOCKERS(env, region); - *nlockers = 0; - return (0); - } -*************** -*** 448,497 **** - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - -- count += 20; - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -! /* -! * Allocate enough space for a count by count bitmap matrix. -! * -! * XXX -! * We can probably save the malloc's between iterations just -! * reallocing if necessary because count grew by too much. -! */ - if ((ret = __os_calloc(env, (size_t)count, -! sizeof(u_int32_t) * nentries, &bitmap)) != 0) - return (ret); - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* -- * Now go back in and actually fill in the matrix. -- */ -- if (region->stat.st_nlockers > count) { -- __os_free(env, bitmap); -- __os_free(env, tmpmap); -- __os_free(env, id_array); -- goto retry; -- } -- -- /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; -- LOCK_LOCKERS(env, region); - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { ---- 462,498 ---- - if (FLD_ISSET(env->dbenv->verbose, DB_VERB_DEADLOCK)) - __db_msg(env, "%lu lockers", (u_long)count); - - nentries = (u_int32_t)DB_ALIGN(count, 32) / 32; - -! /* Allocate enough space for a count by count bitmap matrix. */ - if ((ret = __os_calloc(env, (size_t)count, -! sizeof(u_int32_t) * nentries, &bitmap)) != 0) { -! UNLOCK_LOCKERS(env, region); - return (ret); -+ } - - if ((ret = __os_calloc(env, - sizeof(u_int32_t), nentries, &tmpmap)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - return (ret); - } - - if ((ret = __os_calloc(env, - (size_t)count, sizeof(locker_info), &id_array)) != 0) { -+ UNLOCK_LOCKERS(env, region); - __os_free(env, bitmap); - __os_free(env, tmpmap); - return (ret); - } - - /* - * First we go through and assign each locker a deadlock detector id. - */ - id = 0; - SH_TAILQ_FOREACH(lip, ®ion->lockers, ulinks, __db_locker) { - if (lip->master_locker == INVALID_ROFF) { -+ DB_ASSERT(env, id < count); - lip->dd_id = id++; - id_array[lip->dd_id].id = lip->id; - switch (atype) { -*************** -*** 510,516 **** - lip->dd_id = DD_INVALID_ID; - - } -- UNLOCK_LOCKERS(env, region); - - /* - * We only need consider objects that have waiters, so we use ---- 511,516 ---- -*************** -*** 669,675 **** - * status after building the bit maps so that we will not detect - * a blocked transaction without noting that it is already aborting. - */ -- LOCK_LOCKERS(env, region); - for (id = 0; id < count; id++) { - if (!id_array[id].valid) - continue; ---- 669,674 ---- -*************** -*** 738,743 **** ---- 737,743 ---- - id_array[id].in_abort = 1; - } - UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - - /* - * Now we can release everything except the bitmap matrix that we -*************** -*** 839,844 **** ---- 839,845 ---- - ret = 0; - - /* We must lock so this locker cannot go away while we abort it. */ -+ LOCK_SYSTEM_LOCK(lt, region); - LOCK_LOCKERS(env, region); - - /* -*************** -*** 895,900 **** ---- 896,902 ---- - done: OBJECT_UNLOCK(lt, region, info->last_ndx); - err: - out: UNLOCK_LOCKERS(env, region); -+ LOCK_SYSTEM_UNLOCK(lt, region); - return (ret); - } - diff --git a/main/db/patch.4.7.25.4 b/main/db/patch.4.7.25.4 deleted file mode 100644 index 7a55340023..0000000000 --- a/main/db/patch.4.7.25.4 +++ /dev/null @@ -1,183 +0,0 @@ -*** dbinc/repmgr.h.orig 2009-05-04 10:33:55.000000000 -0400 ---- dbinc/repmgr.h 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 374,379 **** ---- 374,380 ---- - #define SITE_FROM_EID(eid) (&db_rep->sites[eid]) - #define EID_FROM_SITE(s) ((int)((s) - (&db_rep->sites[0]))) - #define IS_VALID_EID(e) ((e) >= 0) -+ #define IS_KNOWN_REMOTE_SITE(e) ((e) >= 0 && ((u_int)(e)) < db_rep->site_cnt) - #define SELF_EID INT_MAX - - #define IS_PEER_POLICY(p) ((p) == DB_REPMGR_ACKS_ALL_PEERS || \ -*** rep/rep_elect.c.orig 2009-05-04 10:35:50.000000000 -0400 ---- rep/rep_elect.c 2009-05-04 10:31:24.000000000 -0400 -*************** -*** 33,39 **** - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int *, int, u_int32_t)); - - /* - * __rep_elect -- ---- 33,39 ---- - static int __rep_fire_elected __P((ENV *, REP *, u_int32_t)); - static void __rep_elect_master __P((ENV *, REP *)); - static int __rep_tally __P((ENV *, REP *, int, u_int32_t *, u_int32_t, roff_t)); -! static int __rep_wait __P((ENV *, db_timeout_t *, int, u_int32_t)); - - /* - * __rep_elect -- -*************** -*** 55,61 **** - ENV *env; - LOG *lp; - REP *rep; -! int done, eid, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; ---- 55,61 ---- - ENV *env; - LOG *lp; - REP *rep; -! int done, elected, full_elect, locked, in_progress, need_req; - int ret, send_vote, t_ret; - u_int32_t ack, ctlflags, egen, nsites, orig_tally, priority, realpri; - u_int32_t tiebreaker; -*************** -*** 181,188 **** - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, &eid, -! 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { ---- 181,187 ---- - REP_SYSTEM_UNLOCK(env); - (void)__rep_send_message(env, DB_EID_BROADCAST, - REP_MASTER_REQ, NULL, NULL, 0, 0); -! ret = __rep_wait(env, &to, 0, REP_F_EPHASE0); - REP_SYSTEM_LOCK(env); - F_CLR(rep, REP_F_EPHASE0); - switch (ret) { -*************** -*** 286,296 **** - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (eid != DB_EID_INVALID && !IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; ---- 285,295 ---- - REP_SYSTEM_LOCK(env); - goto vote; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE1); - switch (ret) { - case 0: - /* Check if election complete or phase complete. */ -! if (!IN_ELECTION(rep)) { - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 1")); - goto edone; -*************** -*** 398,412 **** - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, &eid, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! if (eid != DB_EID_INVALID) -! goto edone; -! ret = DB_REP_UNAVAIL; -! break; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; ---- 397,408 ---- - REP_SYSTEM_LOCK(env); - goto i_won; - } -! ret = __rep_wait(env, &to, full_elect, REP_F_EPHASE2); - RPRINT(env, DB_VERB_REP_ELECT, - (env, "Ended election phase 2 %d", ret)); - switch (ret) { - case 0: -! goto edone; - case DB_REP_EGENCHG: - if (to > timeout) - to = timeout; -*************** -*** 1050,1062 **** - ENV *env; - REP *rep; - { -- /* -- * We often come through here twice, sometimes even more. We mustn't -- * let the redundant calls affect stats counting. But rep_elect relies -- * on this first part for setting eidp. -- */ -- rep->master_id = rep->eid; -- - if (F_ISSET(rep, REP_F_MASTERELECT | REP_F_MASTER)) { - /* We've been through here already; avoid double counting. */ - return; ---- 1046,1051 ---- -*************** -*** 1093,1102 **** - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, eidp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int *eidp, full_elect; - u_int32_t flags; - { - DB_REP *db_rep; ---- 1082,1091 ---- - (timeout > 5000000) ? 500000 : ((timeout >= 10) ? timeout / 10 : 1); - - static int -! __rep_wait(env, timeoutp, full_elect, flags) - ENV *env; - db_timeout_t *timeoutp; -! int full_elect; - u_int32_t flags; - { - DB_REP *db_rep; -*************** -*** 1174,1180 **** - F_CLR(rep, REP_F_EGENUPDATE); - ret = DB_REP_EGENCHG; - } else if (phase_over) { -- *eidp = rep->master_id; - done = 1; - ret = 0; - } ---- 1163,1168 ---- -*** repmgr/repmgr_net.c.orig 2009-05-04 10:34:46.000000000 -0400 ---- repmgr/repmgr_net.c 2009-05-04 10:27:26.000000000 -0400 -*************** -*** 100,105 **** ---- 100,107 ---- - control, rec, &nsites_sent, &npeers_sent)) != 0) - goto out; - } else { -+ DB_ASSERT(env, IS_KNOWN_REMOTE_SITE(eid)); -+ - /* - * If this is a request that can be sent anywhere, then see if - * we can send it to our peer (to save load on the master), but -- cgit v1.2.3