Increase number of enqueued crash files, sending rate, and fix minor bug.
Up to 32 crashes per spool and 32 sends per day.
BUG=6355,6782
Change-Id: I99e86265c035ad62937aa135467681be8ef70f9a
TEST=UserCrash and CrashSender
Review URL: http://codereview.chromium.org/3414006
diff --git a/crash_reporter/crash_collector.cc b/crash_reporter/crash_collector.cc
index 0194fc4..f2f5146 100644
--- a/crash_reporter/crash_collector.cc
+++ b/crash_reporter/crash_collector.cc
@@ -26,8 +26,15 @@
static const uid_t kRootOwner = 0;
static const uid_t kRootGroup = 0;
-// Maximum of 8 crash reports per directory.
-const int CrashCollector::kMaxCrashDirectorySize = 8;
+// Maximum crash reports per crash spool directory. Note that this is
+// a separate maximum from the maximum rate at which we upload these
+// diagnostics. The higher this rate is, the more space we allow for
+// core files, minidumps, and kcrash logs, and equivalently the more
+// processor and I/O bandwidth we dedicate to handling these crashes when
+// many occur at once. Also note that if core files are configured to
+// be left on the file system, we stop adding crashes when either the
+// number of core files or minidumps reaches this number.
+const int CrashCollector::kMaxCrashDirectorySize = 32;
CrashCollector::CrashCollector() : forced_crash_directory_(NULL) {
}
diff --git a/crash_reporter/crash_sender b/crash_reporter/crash_sender
index 37c3362..c62f88a 100644
--- a/crash_reporter/crash_sender
+++ b/crash_reporter/crash_sender
@@ -21,8 +21,8 @@
# Path to find which is required for computing the crash rate.
FIND="/usr/bin/find"
-# Send up to 8 crashes per day.
-MAX_CRASH_RATE=8
+# Maximum crashes to send per day.
+MAX_CRASH_RATE=32
# File whose existence mocks crash sending. If empty we pretend the
# crash sending was successful, otherwise unsuccessful.
@@ -197,13 +197,12 @@
lecho "Crash sending failed with: $(cat ${curl_stderr})"
fi
- rm -f "${report_id}" "${output_file}"
+ rm -f "${report_id}"
return ${curl_result}
}
-# Send all crashes from the given directory. The directory is currently
-# expected to just contain a bunch of minidumps.
+# Send all crashes from the given directory.
send_crashes() {
local dir="$1"
lecho "Considering crashes in ${dir}"
