diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-01-25 17:01:47 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-01-25 17:01:47 +0000 |
commit | af69217fea009d28a9dca78796147a05d3cffb01 (patch) | |
tree | 98fd27434ad1ae66768530dd28b8bde5721e6c5f /db2/common/db_apprec.c | |
parent | ac9f45cfd18eeffd6a9fbbcc86e68657c95658a6 (diff) | |
download | glibc-af69217fea009d28a9dca78796147a05d3cffb01.tar glibc-af69217fea009d28a9dca78796147a05d3cffb01.tar.gz glibc-af69217fea009d28a9dca78796147a05d3cffb01.tar.bz2 glibc-af69217fea009d28a9dca78796147a05d3cffb01.zip |
Update.
1998-01-26 00:57 Ulrich Drepper <drepper@cygnus.com>
* db2/Makefile (routines): Add os_alloc.
* db2/db.h: Update from db-2.3.16.
* db2/db_185.h: Likewise.
* db2/db_int.h: Likewise.
* db2/btree/bt_close.c: Likewise.
* db2/btree/bt_cursor.c: Likewise.
* db2/btree/bt_delete.c: Likewise.
* db2/btree/bt_open.c: Likewise.
* db2/btree/bt_page.c: Likewise.
* db2/btree/bt_put.c: Likewise.
* db2/btree/bt_rec.c: Likewise.
* db2/btree/bt_recno.c: Likewise.
* db2/btree/btree_auto.c: Likewise.
* db2/common/db_appinit.c: Likewise.
* db2/common/db_apprec.c: Likewise.
* db2/common/db_err.c: Likewise.
* db2/common/db_region.c: Likewise.
* db2/common/db_shash.c: Likewise.
* db2/db/db.c: Likewise.
* db2/db/db_auto.c: Likewise.
* db2/db/db_conv.c: Likewise.
* db2/db/db_dispatch.c: Likewise.
* db2/db/db_dup.c: Likewise.
* db2/db/db_pr.c: Likewise.
* db2/db/db_rec.c: Likewise.
* db2/db185/db185.c: Likewise.
* db2/dbm/dbm.c: Likewise.
* db2/hash/hash.c: Likewise.
* db2/hash/hash_auto.c: Likewise.
* db2/hash/hash_dup.c: Likewise.
* db2/hash/hash_page.c: Likewise.
* db2/hash/hash_rec.c: Likewise.
* db2/include/btree_ext.h: Likewise.
* db2/include/clib_ext.h: Likewise.
* db2/include/common_ext.h: Likewise.
* db2/include/db.h.src: Likewise.
* db2/include/db_185.h.src: Likewise.
* db2/include/db_am.h: Likewise.
* db2/include/db_ext.h: Likewise.
* db2/include/db_int.h.src: Likewise.
* db2/include/hash_ext.h: Likewise.
* db2/include/lock_ext.h: Likewise.
* db2/include/log.h: Likewise.
* db2/include/log_auto.h: Likewise.
* db2/include/log_ext.h: Likewise.
* db2/include/mp.h: Likewise.
* db2/include/mp_ext.h: Likewise.
* db2/include/mutex_ext.h: Likewise.
* db2/include/os_ext.h: Likewise.
* db2/include/os_func.h: Likewise.
* db2/include/txn_ext.h: Likewise.
* db2/lock/lock.c: Likewise.
* db2/lock/lock_util.c: Likewise.
* db2/log/log.c: Likewise.
* db2/log/log.src: Likewise.
* db2/log/log_archive.c: Likewise.
* db2/log/log_auto.c: Likewise.
* db2/log/log_get.c: Likewise.
* db2/log/log_put.c: Likewise.
* db2/log/log_rec.c: Likewise.
* db2/log/log_register.c: Likewise.
* db2/mp/mp_bh.c: Likewise.
* db2/mp/mp_fget.c: Likewise.
* db2/mp/mp_fopen.c: Likewise.
* db2/mp/mp_fput.c: Likewise.
* db2/mp/mp_pr.c: Likewise.
* db2/mp/mp_sync.c: Likewise.
* db2/mutex/mutex.c: Likewise.
* db2/os/os_alloc.c: Likewise.
* db2/os/os_config.c: Likewise.
* db2/os/os_stat.c: Likewise.
* db2/progs/db_checkpoint/db_checkpoint.c: Likewise.
* db2/progs/db_deadlock/db_deadlock.c: Likewise.
* db2/progs/db_load/db_load.c: Likewise.
* db2/progs/db_printlog/db_printlog.c: Likewise.
* db2/progs/db_recover/db_recover.c: Likewise.
* db2/progs/db_stat/db_stat.c: Likewise.
* db2/txn/txn.c: Likewise.
* elf/dl-close.c (_dl_close): Rename inner variable named map to imap.
Unmap memory blocks in reverse order of allocation.
Call munmap with load address added to offset.
Bug reported by Miguel de Icaza.
* locale/programs/ld-collate.c (collate_end_weight): Correctly fill
up weight array.
* localedata/locales/cs_CZ: Update by Michael Mraka
<michael@informatics.muni.cz>.
* misc/sys/syslog.h: Reformat a bit. Don't declare vsyslog unless
__USE_BSD.
* nis/nss_compat/compat-grp.c: Correctly handle buffer overflow while
reading line with fgets.
* nis/nss_compat/compat-pwd.c: Likewise.
* nis/nss_compat/compat-spwd.c: Likewise.
* nss/nss_files/files-XXX.c: Likewise.
* nss/nss_files/files-alias.c: Likewise.
* shadow/fgetspent_r.c: Likewise.
* string/strerror_r.c: Correct comment. Patch by Andreas Jaeger.
* sysdeps/unix/sysv/linux/bits/stat.h: Define _STATBUF_ST_RDEV.
* sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise.
* sysdeps/unix/sysv/linux/i386/sys/ucontext.h: Allocate room for
FP register content in ucontext_t.
1998-01-22 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/libm-ieee754/s_modfl.c (modf): Correct
calculation. Patch by Markus Schoder
<Markus.Schoder@dresdner-bank.de>.
* math/libm-test.c (modf_test): Add more tests for modf.
* sysdeps/unix/sysv/linux/sys/mman.h: Add const to mlock and
munlock according to Unix98.
1998-01-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* nss/nss_files/files-network.c (LINE_PARSER): Set n_addrtype to
AF_INET.
1998-01-21 07:22 H.J. Lu <hjl@gnu.org>
* sysdeps/posix/ttyname.c: Handle symbolic links.
* sysdeps/posix/ttyname_r.c: Ditto.
1998-01-25 19:39 Ulrich Drepper <drepper@cygnus.com>
* db2/makedb.c (process_input): Write terminating \0 for value.
(print_database): Simply print value string, don't use length.
1998-01-24 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* nss/nsswitch.c (__nss_configure_lookup): Correct test for early
exit of loop.
1998-01-25 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/ypclnt.c: Don't set dom_client to NULL, or we will not
close all sockets.
1998-01-25 14:54 Ulrich Drepper <drepper@cygnus.com>
* signal/Makefile (routines): Add sighold, sigrelse, sigignore, and
sigset.
* signal/sighold.c: New file.
* signal/sigrelse.c: New file.
* sysdeps/generic/sigignore.c: New file.
* sysdeps/generic/sigset.c: New file.
* sysdeps/posix/sigignore.c: New file.
* sysdeps/posix/sigset.c: New file.
* signal/signal.h: Add prototypes for new functions.
* sysdeps/unix/sysv/linux/alpha/bits/signum.h: Define SIG_HOLD.
* sysdeps/unix/sysv/linux/bits/signum.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/signum.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/signum.h: Likewise.
1998-01-23 00:16 Tim Waugh <tim@cyberelk.demon.co.uk>
* posix/wordexp.c: Added IFS field-splitting in parameter and
command substitution. Fixed an IFS-related bug that caused an
infinite loop.
1998-01-25 12:38 Ulrich Drepper <drepper@cygnus.com>
* stdlib/Makefile (routines): Add getcontext, setcontext, makecontext,
and swapcontext.
* stdlib/ucontext.h: Correct prototypes.
* sysdeps/generic/getcontext.c: New file.
* sysdeps/generic/setcontext.c: New file.
* sysdeps/generic/makecontext.c: New file.
* sysdeps/generic/swapcontext.c: New file.
* sysdeps/unix/sysv/linux/sparc/sparc64/Makefile: Removed.
1998-01-25 04:07 Ulrich Drepper <drepper@cygnus.com>
* resource/sys/resource.h: Remove #include of ulimit.h which is
not allowed by SUSv2 and not available on other systems.
* sysdeps/unix/sysv/linux/ulimit.c: Include ulimit.h.
* streams/Makefile: New file.
* streams/stropts.h: New file.
* sysdeps/generic/bits/stropts.h: New file.
* sysdeps/generic/isastream.c: New file.
* sysdeps/generic/getmsg.c: New file.
* sysdeps/generic/getpmsg.c: New file.
* sysdeps/generic/putmsg.c: New file.
* sysdeps/generic/putpmsg.c: New file.
* sysdeps/generic/fattach.c: New file.
* sysdeps/generic/fdetach.c: New file.
* sysdeps/unix/inet/Subdirs: Add streams.
* sysdeps/generic/bits/types.h: Add definition of __t_scalar_t and
__t_uscalar_t.
* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise.
* sysdeps/mach/_strerror.c: Follow changes of generic version to
handle small buffers correctly.
1998-01-24 17:31 H.J. Lu <hjl@gnu.org>
* sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE):
Remove the 3rd arg and add declaration for _dl_runtime_resolve
and _dl_runtime_profile.
1998-01-25 02:42 Ulrich Drepper <drepper@cygnus.com>
* include/cpio.h: New file. Mainly copied from GNU cpio.
* posix/Makefile (headers): Add cpio.h.
Diffstat (limited to 'db2/common/db_apprec.c')
-rw-r--r-- | db2/common/db_apprec.c | 129 |
1 files changed, 83 insertions, 46 deletions
diff --git a/db2/common/db_apprec.c b/db2/common/db_apprec.c index 188c6b9f95..7a42e13317 100644 --- a/db2/common/db_apprec.c +++ b/db2/common/db_apprec.c @@ -11,12 +11,13 @@ static const char copyright[] = "@(#) Copyright (c) 1997\n\ Sleepycat Software Inc. All rights reserved.\n"; -static const char sccsid[] = "@(#)db_apprec.c 10.19 (Sleepycat) 11/23/97"; +static const char sccsid[] = "@(#)db_apprec.c 10.23 (Sleepycat) 1/17/98"; #endif #ifndef NO_SYSTEM_INCLUDES #include <sys/types.h> +#include <errno.h> #include <time.h> #include <string.h> #include <stdlib.h> @@ -44,9 +45,9 @@ __db_apprec(dbenv, flags) { DBT data; DB_LOG *lp; - DB_LSN ckp_lsn, first_lsn, lsn, tmp_lsn; + DB_LSN ckp_lsn, first_lsn, lsn; time_t now; - int first_flag, is_thread, ret; + int is_thread, ret; void *txninfo; lp = dbenv->lg_info; @@ -63,73 +64,109 @@ __db_apprec(dbenv, flags) F_CLR(lp, DB_AM_THREAD); /* - * Read forward through the log, opening the appropriate files so that - * we can call recovery routines. In general, we start at the last - * checkpoint prior to the last checkpointed LSN. For catastrophic - * recovery, we begin at the first LSN that appears in any log file - * (log_get figures this out for us when we pass it the DB_FIRST flag). + * Recovery is done in three passes: + * Pass #1: + * Read forward through the log from the last checkpoint to the + * end of the log, opening and closing files so that at the end + * of the log we have the "current" set of files open. + * Pass #2: + * Read backward through the log undoing any uncompleted TXNs. + * If doing catastrophic recovery, we read to the beginning of + * the log, otherwise, to the most recent checkpoint that occurs + * before the most recent checkpoint LSN, which is returned by + * __log_findckp(). During this pass, checkpoint file information + * is ignored, and file openings and closings are undone. + * Pass #3: + * Read forward through the log from the LSN found in pass #2, + * redoing any committed TXNs. During this pass, checkpoint + * file information is ignored, and file openings and closings + * are redone. */ - if (LF_ISSET(DB_RECOVER_FATAL)) - first_flag = DB_FIRST; - else { - if ((ret = __log_findckp(lp, &lsn)) == DB_NOTFOUND) - goto out; - first_flag = DB_SET; - } - /* If we're a threaded application, we have to allocate space. */ + /* + * Find the last checkpoint in the log. This is the point from which + * we want to begin pass #1 (the TXN_OPENFILES pass). + */ memset(&data, 0, sizeof(data)); - if ((ret = log_get(lp, &lsn, &data, first_flag)) != 0) { - __db_err(dbenv, "Failure: unable to get log record"); - if (first_flag == DB_SET) - __db_err(dbenv, "Retrieving LSN %lu %lu", - (u_long)lsn.file, (u_long)lsn.offset); - else - __db_err(dbenv, "Retrieving first LSN"); - goto out; + if ((ret = log_get(lp, &ckp_lsn, &data, DB_CHECKPOINT)) != 0) { + /* + * If we don't find a checkpoint, start from the beginning. + * If that fails, we're done. Note, we require that there + * be log records if we're performing recovery, and fail if + * there aren't. + */ + if ((ret = log_get(lp, &ckp_lsn, &data, DB_FIRST)) != 0) { + __db_err(dbenv, "First log record not found"); + if (ret == DB_NOTFOUND) + ret = EINVAL; + goto out; + } } - first_lsn = lsn; + /* + * Now, ckp_lsn is either the lsn of the last checkpoint or the lsn + * of the first record in the log. Begin the TXN_OPENFILES pass from + * that lsn, and proceed to the end of the log. + */ + lsn = ckp_lsn; for (;;) { ret = __db_dispatch(lp, &data, &lsn, TXN_OPENFILES, txninfo); if (ret != 0 && ret != DB_TXN_CKP) goto msgerr; - if ((ret = - log_get(dbenv->lg_info, &lsn, &data, DB_NEXT)) != 0) { - if (ret != DB_NOTFOUND) - goto out; - break; + if ((ret = log_get(lp, &lsn, &data, DB_NEXT)) != 0) { + if (ret == DB_NOTFOUND) + break; + goto out; } } /* - * Initialize the ckp_lsn to 0,0. If we never find a valid - * checkpoint in the log, then leaving ckp_lsn at 0,0 is correct. + * Pass #2. + * + * Before we can begin pass #2, backward roll phase, we determine how + * far back in the log to recover. If we are doing catastrophic + * recovery, then we go as far back as we have files. If we are + * doing normal recovery, we go as back to the most recent checkpoint + * that occurs before the most recent checkpoint LSN. */ - ZERO_LSN(ckp_lsn); + if (LF_ISSET(DB_RECOVER_FATAL)) { + ZERO_LSN(first_lsn); + } else + if ((ret = __log_findckp(lp, &first_lsn)) == DB_NOTFOUND) { + /* + * If recovery was specified, there must be log files. + * If we don't find one, it's an error. (This should + * have been caught above, when a log_get() of DB_FIRST + * or DB_CHECKPOINT succeeded, but paranoia is good.) + */ + ret = EINVAL; + goto out; + } for (ret = log_get(lp, &lsn, &data, DB_LAST); ret == 0 && log_compare(&lsn, &first_lsn) > 0; - ret = log_get(lp,&lsn, &data, DB_PREV)) { - tmp_lsn = lsn; + ret = log_get(lp, &lsn, &data, DB_PREV)) { ret = __db_dispatch(lp, &data, &lsn, TXN_BACKWARD_ROLL, txninfo); - if (ret == DB_TXN_CKP) { - if (IS_ZERO_LSN(ckp_lsn)) - ckp_lsn = tmp_lsn; - ret = 0; - } else if (ret != 0) - goto msgerr; + if (ret != 0) + if (ret != DB_TXN_CKP) + goto msgerr; + else + ret = 0; } if (ret != 0 && ret != DB_NOTFOUND) goto out; + /* + * Pass #3. + */ for (ret = log_get(lp, &lsn, &data, DB_NEXT); ret == 0; ret = log_get(lp, &lsn, &data, DB_NEXT)) { ret = __db_dispatch(lp, &data, &lsn, TXN_FORWARD_ROLL, txninfo); - if (ret == DB_TXN_CKP) - ret = 0; - else if (ret != 0) - goto msgerr; + if (ret != 0) + if (ret != DB_TXN_CKP) + goto msgerr; + else + ret = 0; } if (ret != DB_NOTFOUND) goto out; @@ -149,7 +186,7 @@ __db_apprec(dbenv, flags) goto out; if (dbenv->db_verbose) { - __db_err(lp->dbenv, "Recovery complete at %s", ctime(&now)); + __db_err(lp->dbenv, "Recovery complete at %.24s", ctime(&now)); __db_err(lp->dbenv, "%s %lu %s [%lu][%lu]", "Maximum transaction id", (u_long)dbenv->tx_info->region->last_txnid, |