Skip to content

Commit 6faa082

Browse files
committed
Revert "Debug patch for Bug#17665497 DATANODE CRASH IN DBTUPDISKALLOC.CPP DBTUP (LINE: 848) 0X00000000"
This reverts commit 30e00fcf0ed2f00747797e417266d3603ad82f15.
1 parent 4bcedcc commit 6faa082

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1975,24 +1975,6 @@ Dbtup::disk_restart_alloc_extent(EmulatedJamBuffer* jamBuf,
19751975
ndbassert(old.p->m_free_matrix_pos == RNIL);
19761976
Uint32 pos= alloc.calc_extent_pos(old.p);
19771977
Local_extent_info_list new_list(c_extent_pool, alloc.m_free_extents[pos]);
1978-
#if defined VM_TRACE || defined ERROR_INSERT
1979-
ndbrequire(!"Bug17665497: debugging suspect code path.");
1980-
/**
1981-
* old is already in list with head alloc.m_extent_list.
1982-
* Before adding it to new_list it should be removed from
1983-
* previous list. Otherwise that list will become corrupt
1984-
* and Dbtup::disk_page_get_allocated() will eventually
1985-
* calculate wrong free value. Possibly it could also end
1986-
* up with derefering a released Extent_info.
1987-
*
1988-
* Something like below should be added, but since list is
1989-
* single linked remove is harder, might need to make list
1990-
* double linked.
1991-
*
1992-
* Local_fragment_extent_list list1(c_extent_pool, alloc.m_extent_list);
1993-
* list1.remove(old);
1994-
*/
1995-
#endif
19961978
new_list.addFirst(old);
19971979
old.p->m_free_matrix_pos= pos;
19981980
}
@@ -2057,9 +2039,6 @@ Dbtup::disk_page_get_allocated(const Tablerec* tabPtrP,
20572039
Ptr<Extent_info> extentPtr;
20582040
for (list.first(extentPtr); !extentPtr.isNull(); list.next(extentPtr))
20592041
{
2060-
#if defined VM_TRACE || defined ERROR_INSERT
2061-
ndbrequire(extentPtr.p->m_free_matrix_pos == RNIL);
2062-
#endif
20632042
cnt++;
20642043
free += extentPtr.p->m_free_space;
20652044
}

0 commit comments

Comments
 (0)