[Commits] Rev 3511: Cassandra SE in file:///data0/psergey/dev2/5.5-cassandra-r01/

Sergey Petrunya psergey at askmonty.org
Fri Sep 14 07:44:37 EEST 2012


At file:///data0/psergey/dev2/5.5-cassandra-r01/

------------------------------------------------------------
revno: 3511
revision-id: psergey at askmonty.org-20120914044434-zfvw8nlv4nu26bf6
parent: psergey at askmonty.org-20120912165223-ntxo9x7vhfe267y1
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: 5.5-cassandra-r01
timestamp: Fri 2012-09-14 08:44:34 +0400
message:
  Cassandra SE
  - Catch all kinds of exceptions when calling Thrift code.
=== modified file 'storage/cassandra/cassandra_se.cc'
--- a/storage/cassandra/cassandra_se.cc	2012-09-10 10:40:07 +0000
+++ b/storage/cassandra/cassandra_se.cc	2012-09-14 04:44:34 +0000
@@ -160,9 +160,8 @@
     print_error("%s [%s]", ire.what(), ire.why.c_str());
   }catch(NotFoundException nfe){
     print_error("%s", nfe.what());
-  }
-  catch(...) {
-    print_error("Unknown Exception");
+  }catch (...) {
+    print_error("Unknown exception");
   }
 
   cur_consistency_level= ConsistencyLevel::ONE;
@@ -192,7 +191,10 @@
     print_error("%s [%s]", ire.what(), ire.why.c_str());
   } catch (NotFoundException nfe) {
     print_error("keyspace not found: %s", nfe.what());
+  } catch (...) {
+    print_error("Unknown exception");
   }
+
   return true;
 }
 
@@ -316,6 +318,8 @@
     print_error("UnavailableException: %s", ue.what());
   } catch (TimedOutException te) {
     print_error("TimedOutException: %s", te.what());
+  } catch (...) {
+    print_error("Unknown exception");
   }
 
   return res;
@@ -368,6 +372,9 @@
   } catch (TimedOutException te) {
     print_error("TimedOutException: %s", te.what());
     return true;
+  } catch (...) {
+    print_error("Unknown exception");
+    return true;
   }
 
   column_data_it= column_data_vec.begin();
@@ -470,6 +477,8 @@
     print_error("UnavailableException: %s", ue.what());
   } catch (TimedOutException te) {
     print_error("TimedOutException: %s", te.what());
+  } catch (...) {
+    print_error("Unknown exception");
   }
 
   key_slice_it= key_slice_vec.begin();
@@ -552,6 +561,8 @@
     print_error("UnavailableException: %s", ue.what());
   } catch (TimedOutException te) {
     print_error("TimedOutException: %s", te.what());
+  } catch (...) {
+    print_error("Unknown exception");
   }
 
   return res;
@@ -575,6 +586,8 @@
     print_error("UnavailableException: %s", ue.what());
   } catch (TimedOutException te) {
     print_error("TimedOutException: %s", te.what());
+  } catch (...) {
+    print_error("Unknown exception");
   }
 
   return res;
@@ -629,6 +642,8 @@
     print_error("UnavailableException: %s", ue.what());
   } catch (TimedOutException te) {
     print_error("TimedOutException: %s", te.what());
+  } catch (...) {
+    print_error("Unknown exception");
   }
 
   return res;



More information about the commits mailing list