orthanc: OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp comparison

Fix instances accumulating in DB while their attachments were not stored because of MaximumStorageSize limit reached with a single patient in DB.

comparison

equal deleted inserted replaced

-:588fa6fb32ca
+:23aeffecb8cb
 transaction_.SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
 transaction_.SelectPatientToRecycle(patientToRecycle));
 if (!ok)
 {
-throw OrthancException(ErrorCode_FullStorage);
+throw OrthancException(ErrorCode_FullStorage, "Cannot recycle more patients");
 }
 LOG(TRACE) << "Recycling one patient";
 transaction_.DeleteResource(patientToRecycle);
 }
 catch (OrthancException& e)
 {
 if (e.GetErrorCode() == ErrorCode_DatabaseCannotSerialize)
 {
-throw;
+throw;  // the transaction has failed -> do not commit the current transaction (and retry)
 }
 else
 {
-LOG(ERROR) << "EXCEPTION [" << e.What() << "]";
+LOG(ERROR) << "EXCEPTION [" << e.What() << " - " << e.GetDetails() << "]";
+if (e.GetErrorCode() == ErrorCode_FullStorage)
+{
+throw; // do not commit the current transaction
+}
+// this is an expected failure, exit normaly and commit the current transaction
 storeStatus_ = StoreStatus_Failure;
 }
 }
 }
 };

Mercurial > hg > orthanc