greg/stasis-aries-wal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed problem in lsm tree recovery; it was not updating the lsm tree header when passing C1 into C2's merger thread. Then C2 freed C1, and C1 pointed to uninitialized data.

Browse source
This commit is contained in:
Sears Russell 2008-12-04 09:22:17 +00:00
parent e4341e10b9
commit 79d1512a5e
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/stasis/operations/lsmTree.c
View file

@ -21,6 +21,7 @@ pageid_t TlsmRegionAlloc(int xid, void *conf) {
a->regionList = TarrayListAlloc(xid, 1, 4, sizeof(pageid_t));
a->regionCount = 0;
}
DEBUG("{%lld <- alloc region arraylist}\n", a->regionList.page);
TarrayListExtend(xid,a->regionList,1);
a->regionList.slot = a->regionCount;
DEBUG("region lst slot %lld\n",a->regionList.slot);
@ -63,6 +64,7 @@ void TlsmRegionDeallocRid(int xid, void *conf) {
recordid rid = *(recordid*)conf;
TlsmRegionAllocConf_t a;
Tread(xid,rid,&a);
DEBUG("{%lld <- dealloc region arraylist}\n", a.regionList.page);
// TlsmRegionAllocConf_t* a = (TlsmRegionAllocConf_t*)conf;
for(int i = 0; i < a.regionCount; i++) {
a.regionList.slot = i;
@ -77,6 +79,7 @@ pageid_t TlsmRegionAllocRid(int xid, void * ridp) {
TlsmRegionAllocConf_t conf;
Tread(xid,rid,&conf);
pageid_t ret = TlsmRegionAlloc(xid,&conf);
DEBUG("{%lld <- alloc region extend}\n", conf.regionList.page);
// XXX get rid of Tset by storing next page in memory, and losing it
// on crash.
Tset(xid,rid,&conf);

33
stasis/operations/lsmTable.h
View file

@ -28,6 +28,7 @@ namespace rose {
recordid bigTree;
recordid bigTreeAllocState; // this is probably the head of an arraylist of regions used by the tree...
// recordid oldBigTreeAllocState; // this is probably the head of an arraylist of regions used by the tree...
// XXX need in between tree for when we crash w/o clean shutdown.
recordid mediumTree;
recordid mediumTreeAllocState;
// recordid oldMediumTreeAllocState;
@ -270,24 +271,32 @@ namespace rose {
// always free in tree and old my tree
lsmTableHeader_t h;
void * oldAllocState = a->pageAllocState;
Tread(xid, a->tree, &h);
if(!a->out_tree) {
h.bigTree = scratch_tree->r_;
h.bigTreeAllocState = *scratchAllocState;
printf("updated C2's position on disk to %lld\n", scratch_tree->r_.page);
DEBUG("%d updated C2's position on disk to %lld\n",
PAGELAYOUT::FMT::TUP::NN, scratch_tree->r_.page);
} else {
h.mediumTree = scratch_tree->r_;
h.mediumTreeAllocState = *scratchAllocState;
printf("updated C1's position on disk to %lld\n", scratch_tree->r_.page);
DEBUG("%d updated C1's position on disk to %lld\n",
PAGELAYOUT::FMT::TUP::NN, scratch_tree->r_.page);
}
Tset(xid, a->tree, &h);
// free old my_tree here
TlsmFree(xid,a->my_tree->r_,TlsmRegionDeallocRid,a->pageAllocState);
// need to commit before calling free, since a concurrent tree
// might reuse our region before the commit happens.
Tcommit(xid);
xid = Tbegin(); // XXX right thing to do here?
// free old my_tree here
TlsmFree(xid,a->my_tree->r_,TlsmRegionDeallocRid,oldAllocState);
DEBUG("%d freed C?: (my_tree) %lld\n",
PAGELAYOUT::FMT::TUP::NN, a->my_tree->r_.page);
if(a->out_tree) {
double frac_wasted =
((double)RB_TREE_OVERHEAD)
@ -334,6 +343,13 @@ namespace rose {
a->my_tree->r_ = TlsmCreate(xid, PAGELAYOUT::cmp_id(),a->pageAlloc,
a->pageAllocState,TUP::sizeofBytes());
Tread(xid, a->tree, &h);
h.mediumTree = a->my_tree->r_;
h.mediumTreeAllocState = *(recordid*)(a->pageAllocState);
Tset(xid, a->tree, &h);
Tcommit(xid);
xid = Tbegin();
} else {
// there is an out tree, but we don't want to push updates to it yet
// replace my_tree with output of merge
@ -354,6 +370,9 @@ namespace rose {
TlsmFree(xid,
(**(typename ITERA::handle**)a->in_tree)->r_,
TlsmRegionDeallocRid,a->in_tree_allocer);
DEBUG("%d freed C?: (in_tree) %lld\n", PAGELAYOUT::FMT::TUP::NN,
(**(typename ITERA::handle**)a->in_tree)->r_.page);
} else {
(**(typename STL_ITER::handle**)a->in_tree)->clear();
}
@ -549,8 +568,8 @@ namespace rose {
oldridp = (recordid*)malloc(sizeof(recordid));
*oldridp = NULLRID;
printf("big tree is %lld\n", (long long)h.bigTree.page);
printf("medium tree is %lld\n", (long long)h.mediumTree.page);
DEBUG("big tree is %lld\n", (long long)h.bigTree.page);
DEBUG("medium tree is %lld\n", (long long)h.mediumTree.page);
ret->args2 = (merge_args<PAGELAYOUT,LSM_ITER,RB_ITER>*)malloc(sizeof(merge_args<PAGELAYOUT,LSM_ITER,RB_ITER>));
merge_args<PAGELAYOUT, LSM_ITER, RB_ITER> tmpargs2 =