From 7379848ae57634da8755b13c7bf2d21e6c990cb7 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Wed, 24 Jun 2015 16:38:40 +0200 Subject: Moved AString reading hack to cFile. --- src/WorldStorage/WSSAnvil.cpp | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'src/WorldStorage/WSSAnvil.cpp') diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index a4c9f4fbf..3bba0a969 100755 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -109,11 +109,11 @@ cWSSAnvil::cWSSAnvil(cWorld * a_World, int a_CompressionFactor) : Writer.AddByte("thundering", a_World->IsWeatherStorm() ? 1 : 0); Writer.AddInt("GameType", static_cast(a_World->GetGameMode())); Writer.AddInt("generatorVersion", 1); - Writer.AddInt("SpawnX", static_cast(a_World->GetSpawnX())); - Writer.AddInt("SpawnY", static_cast(a_World->GetSpawnY())); - Writer.AddInt("SpawnZ", static_cast(a_World->GetSpawnZ())); + Writer.AddInt("SpawnX", FloorC(a_World->GetSpawnX())); + Writer.AddInt("SpawnY", FloorC(a_World->GetSpawnY())); + Writer.AddInt("SpawnZ", FloorC(a_World->GetSpawnZ())); Writer.AddInt("version", 19133); - Writer.AddLong("DayTime", static_cast(a_World->GetTimeOfDay())); + Writer.AddLong("DayTime", a_World->GetTimeOfDay()); Writer.AddLong("Time", a_World->GetWorldAge()); Writer.AddLong("SizeOnDisk", 0); Writer.AddString("generatorName", "default"); @@ -122,11 +122,6 @@ cWSSAnvil::cWSSAnvil(cWorld * a_World, int a_CompressionFactor) : Writer.EndCompound(); Writer.Finish(); - #ifdef _DEBUG - cParsedNBT TestParse(Writer.GetResult().data(), Writer.GetResult().size()); - ASSERT(TestParse.IsValid()); - #endif // _DEBUG - gzFile gz = gzopen((FILE_IO_PREFIX + fnam).c_str(), "wb"); if (gz != nullptr) { @@ -1888,7 +1883,7 @@ void cWSSAnvil::LoadArrowFromNBT(cEntityList & a_Entities, const cParsedNBT & a_ case TAG_Short: { // Vanilla uses this - Arrow->SetBlockHit(Vector3i(static_cast(a_NBT.GetShort(InBlockXIdx)), static_cast(a_NBT.GetShort(InBlockYIdx)), static_cast(a_NBT.GetShort(InBlockZIdx)))); + Arrow->SetBlockHit(Vector3i(a_NBT.GetShort(InBlockXIdx), a_NBT.GetShort(InBlockYIdx), a_NBT.GetShort(InBlockZIdx))); break; } default: @@ -3138,15 +3133,22 @@ bool cWSSAnvil::cMCAFile::GetChunkData(const cChunkCoords & a_Chunk, AString & a return false; } - m_File.Seek(static_cast(ChunkOffset) * 4096); + m_File.Seek(static_cast(ChunkOffset * 4096)); - int ChunkSize = 0; + UInt32 ChunkSize = 0; if (m_File.Read(&ChunkSize, 4) != 4) { LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); return false; } - ChunkSize = ntohl(static_cast(ChunkSize)); + ChunkSize = ntohl(ChunkSize); + if (ChunkSize < 1) + { + // Chunk size too small + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + return false; + } + char CompressionType = 0; if (m_File.Read(&CompressionType, 1) != 1) { @@ -3161,9 +3163,8 @@ bool cWSSAnvil::cMCAFile::GetChunkData(const cChunkCoords & a_Chunk, AString & a } ChunkSize--; - // HACK: This depends on the internal knowledge that AString's data() function returns the internal buffer directly - a_Data.assign(static_cast(ChunkSize), '\0'); - if (static_cast(m_File.Read(static_cast(const_cast(a_Data.data())), static_cast(ChunkSize))) == static_cast(ChunkSize)) + a_Data = m_File.Read(ChunkSize); + if (a_Data.size() == ChunkSize) { return true; } -- cgit v1.2.3 From 08aa3f6ff531d423cd244cd95976b0f8a2289cc0 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Wed, 24 Jun 2015 17:16:01 +0200 Subject: Added reason parameter to load failures. --- src/WorldStorage/WSSAnvil.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/WorldStorage/WSSAnvil.cpp') diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index 3bba0a969..2ee2031b5 100755 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -69,14 +69,14 @@ Since only the header is actually in the memory, this number can be high, but st */ #define MAX_MCA_FILES 32 -#define LOAD_FAILED(CHX, CHZ) \ +#define LOAD_FAILED(CHX, CHZ, REASON) \ { \ const int RegionX = FAST_FLOOR_DIV(CHX, 32); \ const int RegionZ = FAST_FLOOR_DIV(CHZ, 32); \ - LOGERROR("%s (%d): Loading chunk [%d, %d] from file r.%d.%d.mca failed. " \ + LOGERROR("%s (%d): Loading chunk [%d, %d] from file r.%d.%d.mca failed: %s. " \ "The server will now abort in order to avoid further data loss. " \ "Please add the reported file and this message to the issue report.", \ - __FUNCTION__, __LINE__, CHX, CHZ, RegionX, RegionZ \ + __FUNCTION__, __LINE__, CHX, CHZ, RegionX, RegionZ, REASON \ ); \ *(reinterpret_cast(0)) = 0; /* Crash intentionally */ \ } @@ -277,7 +277,7 @@ bool cWSSAnvil::LoadChunkFromData(const cChunkCoords & a_Chunk, const AString & if (res != Z_OK) { LOGWARNING("Uncompressing chunk [%d, %d] failed: %d", a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, res); - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "InflateString() failed"); return false; } @@ -286,7 +286,7 @@ bool cWSSAnvil::LoadChunkFromData(const cChunkCoords & a_Chunk, const AString & if (!NBT.IsValid()) { // NBT Parsing failed - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "NBT parsing failed"); return false; } @@ -333,19 +333,19 @@ bool cWSSAnvil::LoadChunkFromNBT(const cChunkCoords & a_Chunk, const cParsedNBT int Level = a_NBT.FindChildByName(0, "Level"); if (Level < 0) { - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Missing NBT tag: Level"); return false; } int Sections = a_NBT.FindChildByName(Level, "Sections"); if ((Sections < 0) || (a_NBT.GetType(Sections) != TAG_List)) { - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Missing NBT tag: Sections"); return false; } eTagType SectionsType = a_NBT.GetChildrenType(Sections); if ((SectionsType != TAG_Compound) && (SectionsType != TAG_End)) { - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "NBT tag has wrong type: Sections"); return false; } for (int Child = a_NBT.GetFirstChild(Sections); Child >= 0; Child = a_NBT.GetNextSibling(Child)) @@ -3138,27 +3138,27 @@ bool cWSSAnvil::cMCAFile::GetChunkData(const cChunkCoords & a_Chunk, AString & a UInt32 ChunkSize = 0; if (m_File.Read(&ChunkSize, 4) != 4) { - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Cannot read chunk size"); return false; } ChunkSize = ntohl(ChunkSize); if (ChunkSize < 1) { // Chunk size too small - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Chunk size too small"); return false; } char CompressionType = 0; if (m_File.Read(&CompressionType, 1) != 1) { - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Cannot read chunk compression"); return false; } if (CompressionType != 2) { // Chunk is in an unknown compression - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, Printf("Unknown chunk compression: %d", CompressionType).c_str()); return false; } ChunkSize--; @@ -3168,7 +3168,7 @@ bool cWSSAnvil::cMCAFile::GetChunkData(const cChunkCoords & a_Chunk, AString & a { return true; } - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ); + LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Cannot read entire chunk data"); return false; } -- cgit v1.2.3 From d2a0c85764eaec1d6e5e581b3ad28a4c8d0539a2 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Tue, 28 Jul 2015 15:53:28 +0200 Subject: Chunks that fail to load are offloaded to extra files. Ref.: #1970 --- src/WorldStorage/WSSAnvil.cpp | 106 +++++++++++++++++++++++++++++------------- 1 file changed, 73 insertions(+), 33 deletions(-) (limited to 'src/WorldStorage/WSSAnvil.cpp') diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index 2ee2031b5..4eb10fcc8 100755 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -69,18 +69,6 @@ Since only the header is actually in the memory, this number can be high, but st */ #define MAX_MCA_FILES 32 -#define LOAD_FAILED(CHX, CHZ, REASON) \ - { \ - const int RegionX = FAST_FLOOR_DIV(CHX, 32); \ - const int RegionZ = FAST_FLOOR_DIV(CHZ, 32); \ - LOGERROR("%s (%d): Loading chunk [%d, %d] from file r.%d.%d.mca failed: %s. " \ - "The server will now abort in order to avoid further data loss. " \ - "Please add the reported file and this message to the issue report.", \ - __FUNCTION__, __LINE__, CHX, CHZ, RegionX, RegionZ, REASON \ - ); \ - *(reinterpret_cast(0)) = 0; /* Crash intentionally */ \ - } - @@ -186,6 +174,56 @@ bool cWSSAnvil::SaveChunk(const cChunkCoords & a_Chunk) +void cWSSAnvil::ChunkLoadFailed(int a_ChunkX, int a_ChunkZ, const AString & a_Reason, const AString & a_ChunkDataToSave) +{ + // Construct the filename for offloading: + AString OffloadFileName; + Printf(OffloadFileName, "%s%cregion%cbadchunks", m_World->GetName().c_str(), cFile::PathSeparator, cFile::PathSeparator); + cFile::CreateFolder(FILE_IO_PREFIX + OffloadFileName); + auto t = time(nullptr); + struct tm stm; + #ifdef _MSC_VER + localtime_s(&stm, &t); + #else + localtime_r(&t, &stm); + #endif + AppendPrintf(OffloadFileName, "%cch.%d.%d.%d-%02d-%02d-%02d-%02d-%02d.dat", + cFile::PathSeparator, a_ChunkX, a_ChunkZ, + stm.tm_year + 1900, stm.tm_mon + 1, stm.tm_mday, stm.tm_hour, stm.tm_min, stm.tm_sec + ); + + // Log the warning to console: + const int RegionX = FAST_FLOOR_DIV(a_ChunkX, 32); + const int RegionZ = FAST_FLOOR_DIV(a_ChunkZ, 32); + AString Info = Printf("Loading chunk [%d, %d] for world %s from file r.%d.%d.mca failed: %s. Offloading old chunk data to file %s and regenerating chunk.", + a_ChunkX, a_ChunkZ, m_World->GetName().c_str(), RegionX, RegionZ, a_Reason.c_str(), OffloadFileName.c_str() + ); + LOGWARNING("%s", Info.c_str()); + + // Write the data: + cFile f; + if (!f.Open(OffloadFileName, cFile::fmWrite)) + { + LOGWARNING("Cannot open file %s for writing! Old chunk data is lost.", OffloadFileName.c_str()); + return; + } + f.Write(a_ChunkDataToSave.data(), a_ChunkDataToSave.size()); + f.Close(); + + // Write a description file: + if (!f.Open(OffloadFileName + ".info", cFile::fmWrite)) + { + LOGWARNING("Cannot open file %s.info for writing! The information about the failed chunk will not be written.", OffloadFileName.c_str()); + return; + } + f.Write(Info.c_str(), Info.size()); + f.Close(); +} + + + + + bool cWSSAnvil::GetChunkData(const cChunkCoords & a_Chunk, AString & a_Data) { cCSLock Lock(m_CS); @@ -249,7 +287,7 @@ cWSSAnvil::cMCAFile * cWSSAnvil::LoadMCAFile(const cChunkCoords & a_Chunk) Printf(FileName, "%s%cregion", m_World->GetName().c_str(), cFile::PathSeparator); cFile::CreateFolder(FILE_IO_PREFIX + FileName); AppendPrintf(FileName, "/r.%d.%d.mca", RegionX, RegionZ); - cMCAFile * f = new cMCAFile(FileName, RegionX, RegionZ); + cMCAFile * f = new cMCAFile(*this, FileName, RegionX, RegionZ); if (f == nullptr) { return nullptr; @@ -277,7 +315,7 @@ bool cWSSAnvil::LoadChunkFromData(const cChunkCoords & a_Chunk, const AString & if (res != Z_OK) { LOGWARNING("Uncompressing chunk [%d, %d] failed: %d", a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, res); - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "InflateString() failed"); + ChunkLoadFailed(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "InflateString() failed", a_Data); return false; } @@ -286,12 +324,12 @@ bool cWSSAnvil::LoadChunkFromData(const cChunkCoords & a_Chunk, const AString & if (!NBT.IsValid()) { // NBT Parsing failed - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "NBT parsing failed"); + ChunkLoadFailed(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "NBT parsing failed", a_Data); return false; } // Load the data from NBT: - return LoadChunkFromNBT(a_Chunk, NBT); + return LoadChunkFromNBT(a_Chunk, NBT, a_Data); } @@ -316,7 +354,7 @@ bool cWSSAnvil::SaveChunkToData(const cChunkCoords & a_Chunk, AString & a_Data) -bool cWSSAnvil::LoadChunkFromNBT(const cChunkCoords & a_Chunk, const cParsedNBT & a_NBT) +bool cWSSAnvil::LoadChunkFromNBT(const cChunkCoords & a_Chunk, const cParsedNBT & a_NBT, const AString & a_RawChunkData) { // The data arrays, in MCA-native y / z / x ordering (will be reordered for the final chunk data) cChunkDef::BlockTypes BlockTypes; @@ -333,19 +371,19 @@ bool cWSSAnvil::LoadChunkFromNBT(const cChunkCoords & a_Chunk, const cParsedNBT int Level = a_NBT.FindChildByName(0, "Level"); if (Level < 0) { - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Missing NBT tag: Level"); + ChunkLoadFailed(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Missing NBT tag: Level", a_RawChunkData); return false; } int Sections = a_NBT.FindChildByName(Level, "Sections"); if ((Sections < 0) || (a_NBT.GetType(Sections) != TAG_List)) { - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Missing NBT tag: Sections"); + ChunkLoadFailed(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Missing NBT tag: Sections", a_RawChunkData); return false; } eTagType SectionsType = a_NBT.GetChildrenType(Sections); if ((SectionsType != TAG_Compound) && (SectionsType != TAG_End)) { - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "NBT tag has wrong type: Sections"); + ChunkLoadFailed(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "NBT tag has wrong type: Sections", a_RawChunkData); return false; } for (int Child = a_NBT.GetFirstChild(Sections); Child >= 0; Child = a_NBT.GetNextSibling(Child)) @@ -3035,7 +3073,8 @@ bool cWSSAnvil::GetBlockEntityNBTPos(const cParsedNBT & a_NBT, int a_TagIdx, int //////////////////////////////////////////////////////////////////////////////// // cWSSAnvil::cMCAFile: -cWSSAnvil::cMCAFile::cMCAFile(const AString & a_FileName, int a_RegionX, int a_RegionZ) : +cWSSAnvil::cMCAFile::cMCAFile(cWSSAnvil & a_ParentSchema, const AString & a_FileName, int a_RegionX, int a_RegionZ) : + m_ParentSchema(a_ParentSchema), m_RegionX(a_RegionX), m_RegionZ(a_RegionZ), m_FileName(a_FileName) @@ -3138,39 +3177,40 @@ bool cWSSAnvil::cMCAFile::GetChunkData(const cChunkCoords & a_Chunk, AString & a UInt32 ChunkSize = 0; if (m_File.Read(&ChunkSize, 4) != 4) { - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Cannot read chunk size"); + m_ParentSchema.ChunkLoadFailed(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Cannot read chunk size", ""); return false; } ChunkSize = ntohl(ChunkSize); if (ChunkSize < 1) { // Chunk size too small - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Chunk size too small"); + m_ParentSchema.ChunkLoadFailed(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Chunk size too small", ""); return false; } char CompressionType = 0; if (m_File.Read(&CompressionType, 1) != 1) { - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Cannot read chunk compression"); + m_ParentSchema.ChunkLoadFailed(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Cannot read chunk compression", ""); return false; } + ChunkSize--; + + a_Data = m_File.Read(ChunkSize); + if (a_Data.size() != ChunkSize) + { + m_ParentSchema.ChunkLoadFailed(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Cannot read entire chunk data", a_Data); + return false; + } + if (CompressionType != 2) { // Chunk is in an unknown compression - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, Printf("Unknown chunk compression: %d", CompressionType).c_str()); + m_ParentSchema.ChunkLoadFailed(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, Printf("Unknown chunk compression: %d", CompressionType).c_str(), a_Data); return false; } - ChunkSize--; - - a_Data = m_File.Read(ChunkSize); - if (a_Data.size() == ChunkSize) - { return true; } - LOAD_FAILED(a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, "Cannot read entire chunk data"); - return false; -} -- cgit v1.2.3