SERVER-6132 makeChunkWritable abort on failure (Windows)

1 files changed, 15 insertions, 6 deletions

diff --git a/src/mongo/util/mmap_win.cpp b/src/mongo/util/mmap_win.cpp
index 8bc7097c144..2a334254e3f 100644
--- a/src/mongo/util/mmap_win.cpp
+++ b/src/mongo/util/mmap_win.cpp
@@ -259,12 +259,21 @@ namespace mongo {
             size_t protectSize = protectEnd - protectStart;
             dassert(protectSize>0&&protectSize<=MemoryMappedFile::ChunkSize);
 
-            DWORD old;
-            bool ok = VirtualProtect((void*)protectStart, protectSize, PAGE_WRITECOPY, &old);
-            if( !ok ) {
-                DWORD e = GetLastError();
-                log() << "VirtualProtect failed (mcw) " << mmf->filename() << ' ' << chunkno << hex << protectStart << ' ' << protectSize << ' ' << errnoWithDescription(e) << endl;
-                verify(false);
+            DWORD oldProtection;
+            bool ok = VirtualProtect( reinterpret_cast<void*>( protectStart ),
+                                      protectSize,
+                                      PAGE_WRITECOPY,
+                                      &oldProtection );
+            if ( !ok ) {
+                DWORD dosError = GetLastError();
+                log() << "VirtualProtect for " << mmf->filename()
+                        << " chunk " << chunkno
+                        << " failed with " << errnoWithDescription( dosError )
+                        << " (chunk size is " << protectSize
+                        << ", address is " << hex << protectStart << dec << ")"
+                        << " in mongo::makeChunkWritable, terminating"
+                        << endl;
+                fassertFailed( 16362 );
             }
         }