Merge pull request #233 from eosnetworkfoundation/fix_exit_on_db_smaller_than_snapshot

ndcgundlach · web-flow · commit 32d2b4be8a19 · 2022-05-13T14:11:53.000-05:00
cleaned up handling of failed startup from snapshot
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -569,12 +569,12 @@ struct controller_impl {
          ilog( "database initialized with hash: ${hash}", ("hash", hash) );
 
          init(check_shutdown);
+         ilog( "Finished initialization from snapshot" );
       } catch (boost::interprocess::bad_alloc& e) {
-         elog( "db storage not configured to have enough storage for the provided snapshot, please increase and retry snapshot" );
-         throw e;
+         elog( "Failed initialization from snapshot - db storage not configured to have enough storage for the provided snapshot, please increase and retry snapshot" );
+         shutdown();
       }
 
-      ilog( "Finished initialization from snapshot" );
    }
 
    void startup(std::function<void()> shutdown, std::function<bool()> check_shutdown, const genesis_state& genesis) {

Original file line number	Diff line number	Diff line change
`@@ -569,12 +569,12 @@ struct controller_impl {`
`569`	`569`	`ilog( "database initialized with hash: ${hash}", ("hash", hash) );`
`570`	`570`
`571`	`571`	`init(check_shutdown);`
	`572`	`+ ilog( "Finished initialization from snapshot" );`
`572`	`573`	`} catch (boost::interprocess::bad_alloc& e) {`
`573`		`- elog( "db storage not configured to have enough storage for the provided snapshot, please increase and retry snapshot" );`
`574`		`- throw e;`
	`574`	`+ elog( "Failed initialization from snapshot - db storage not configured to have enough storage for the provided snapshot, please increase and retry snapshot" );`
	`575`	`+ shutdown();`
`575`	`576`	`}`
`576`	`577`
`577`		`- ilog( "Finished initialization from snapshot" );`
`578`	`578`	`}`
`579`	`579`
`580`	`580`	`void startup(std::function<void()> shutdown, std::function<bool()> check_shutdown, const genesis_state& genesis) {`