Merge 146950 "IndexedDB: Histogram cause of LevelDB write errors"

Source/WebCore/platform/leveldb/LevelDBDatabase.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 141 matching lines @@
         HistogramSupport::histogramEnumeration("WebCore.IndexedDB.LevelDB.FreeDiskSpaceFailure", 1/*sample*/, 2/*boundary*/);
         return;
     }
     int clampedDiskSpaceKBytes = freeDiskSpaceInKBytes > INT_MAX ? INT_MAX : freeDiskSpaceInKBytes;
     const uint64_t histogramMax = static_cast<uint64_t>(1e9);
     COMPILE_ASSERT(histogramMax <= INT_MAX, histogramMaxTooBig);
     HistogramSupport::histogramCustomCounts(name.utf8().data(), clampedDiskSpaceKBytes, 1, histogramMax, 11/*buckets*/);
 #endif
 }
 
+static void histogramLevelDBError(const char* histogramName, const leveldb::Status& s)
+{
+    ASSERT(!s.ok());
+    enum {
+        LevelDBNotFound,
+        LevelDBCorruption,
+        LevelDBIOError,
+        LevelDBOther,
+        LevelDBMaxError
+    };
+    int levelDBError = LevelDBOther;
+    if (s.IsNotFound())
+        levelDBError = LevelDBNotFound;
+    else if (s.IsCorruption())
+        levelDBError = LevelDBCorruption;
+    else if (s.IsIOError())
+        levelDBError = LevelDBIOError;
+    HistogramSupport::histogramEnumeration(histogramName, levelDBError, LevelDBMaxError);
+}
+
 PassOwnPtr<LevelDBDatabase> LevelDBDatabase::open(const String& fileName, const LevelDBComparator* comparator)
 {
     OwnPtr<ComparatorAdapter> comparatorAdapter = adoptPtr(new ComparatorAdapter(comparator));
 
     leveldb::DB* db;
     const leveldb::Status s = openDB(comparatorAdapter.get(), leveldb::IDBEnv(), fileName, &db);
 
     if (!s.ok()) {
-        enum {
-            LevelDBNotFound,
-            LevelDBCorruption,
-            LevelDBIOError,
-            LevelDBOther,
-            LevelDBMaxError
-        };
-        int levelDBError = LevelDBOther;
-        if (s.IsNotFound())
-            levelDBError = LevelDBNotFound;
-        else if (s.IsCorruption())
-            levelDBError = LevelDBCorruption;
-        else if (s.IsIOError())
-            levelDBError = LevelDBIOError;
-        HistogramSupport::histogramEnumeration("WebCore.IndexedDB.LevelDBOpenErrors", levelDBError, LevelDBMaxError);
-
+        histogramLevelDBError("WebCore.IndexedDB.LevelDBOpenErrors", s);
         histogramFreeSpace("Failure", fileName);
 
         LOG_ERROR("Failed to open LevelDB database from %s: %s", fileName.ascii().data(), s.ToString().c_str());
         return nullptr;
     }
 
     histogramFreeSpace("Success", fileName);
 
     OwnPtr<LevelDBDatabase> result = adoptPtr(new LevelDBDatabase);
     result->m_db = adoptPtr(db);
@@ skipping 73 matching lines @@
 }
 
 bool LevelDBDatabase::write(LevelDBWriteBatch& writeBatch)
 {
     leveldb::WriteOptions writeOptions;
     writeOptions.sync = true;
 
     const leveldb::Status s = m_db->Write(writeOptions, writeBatch.m_writeBatch.get());
     if (s.ok())
         return true;
+    histogramLevelDBError("WebCore.IndexedDB.LevelDBWriteErrors", s);
     LOG_ERROR("LevelDB write failed: %s", s.ToString().c_str());
     return false;
 }
 
 namespace {
 class IteratorImpl : public LevelDBIterator {
 public:
     ~IteratorImpl() { };
 
     virtual bool isValid() const;
@@ skipping 80 matching lines @@
 }
 
 const LevelDBComparator* LevelDBDatabase::comparator() const
 {
     return m_comparator;
 }
 
 }
 
 #endif