change the default crash type from "freeze" to "other"

2 files changed, 24 insertions, 5 deletions

diff --git a/build.sh b/build.sh
index 875b39f9c1..9f070f2d10 100755
--- a/build.sh
+++ b/build.sh
@@ -412,6 +412,15 @@ then
   fi
 fi
 
+# Some of the uploads takes a long time to finish in the codeticket backend,
+# causing the next codeticket upload attempt to fail.
+# Inserting this after each potentially large upload may prevent those errors.
+# JJ is making changes to Codeticket that we hope will eliminate this failure, then this can be removed
+wait_for_codeticket()
+{
+    sleep $(( 60 * 6 ))
+}
+
 # check status and upload results to S3
 if $succeeded
 then
@@ -428,6 +437,7 @@ then
       # Upload base package.
       python_cmd "$helpers/codeticket.py" addoutput Installer "$package"  \
           || fatal "Upload of installer failed"
+      wait_for_codeticket
 
       # Upload additional packages.
       for package_id in $additional_packages
@@ -437,6 +447,7 @@ then
         then
           python_cmd "$helpers/codeticket.py" addoutput "Installer $package_id" "$package" \
               || fatal "Upload of installer $package_id failed"
+          wait_for_codeticket
         else
           record_failure "Failed to find additional package for '$package_id'."
         fi
@@ -447,12 +458,10 @@ then
           # nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file.
           if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]
           then
-              # This next upload is a frequent failure; see if giving the last one some time helps
-              # JJ is making changes to Codeticket that we hope will eliminate this failure soon
-              sleep 30
               # Upload crash reporter file
               python_cmd "$helpers/codeticket.py" addoutput "Symbolfile" "$VIEWER_SYMBOL_FILE" \
                   || fatal "Upload of symbolfile failed"
+              wait_for_codeticket
           fi
 
           # Upload the llphysicsextensions_tpv package, if one was produced
@@ -460,6 +469,9 @@ then
           if [ -r "$build_dir/llphysicsextensions_package" ]
           then
               llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
+              # This next upload is a frequent failure; see if giving the last one some time helps
+              # JJ is making changes to Codeticket that we hope will eliminate this failure soon
+              sleep 300
               python_cmd "$helpers/codeticket.py" addoutput "Physics Extensions Package" "$llphysicsextensions_package" --private \
                   || fatal "Upload of physics extensions package failed"
           fi
@@ -470,6 +482,7 @@ then
           for extension in ${build_dir}/packages/upload-extensions/*.sh; do
               begin_section "Upload Extension $extension"
               . $extension
+              wait_for_codeticket
               end_section "Upload Extension $extension"
           done
       fi
@@ -479,7 +492,6 @@ then
     record_event "skipping upload of installer"
   fi
 
-  
 else
     record_event "skipping upload of installer due to failed build"
 fi
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e6ba3e4f7c..1fda07edd6 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3508,6 +3508,10 @@ void LLAppViewer::handleViewerCrash()
 		gDebugInfo["Dynamic"]["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
 	}
 
+	// The crash is being handled here so set this value to false.
+	// Otherwise the crash logger will think this crash was a freeze.
+	gDebugInfo["Dynamic"]["CrashNotHandled"] = (LLSD::Boolean)false;
+
 	//Write out the crash status file
 	//Use marker file style setup, as that's the simplest, especially since
 	//we're already in a crash situation
@@ -3680,8 +3684,11 @@ void LLAppViewer::processMarkerFiles()
 		{
 			// the file existed, is ours, and matched our version, so we can report on what it says
 			LL_INFOS("MarkerFile") << "Exec marker '"<< mMarkerFileName << "' found; last exec FROZE" << LL_ENDL;
+#           if LL_BUGSPLAT            
+			gLastExecEvent = LAST_EXEC_OTHER_CRASH;
+#           else
 			gLastExecEvent = LAST_EXEC_FROZE;
-
+#           endif
 		}
 		else
 		{