cleaned up handling of failed startup from snapshot

ndcgundlach · ndcgundlach · commit bc0313a8b64a · 2022-05-13T09:16:44.000-05:00
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -571,12 +571,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
`@@ -571,12 +571,12 @@ struct controller_impl {`
`571`	`571`	`ilog( "database initialized with hash: ${hash}", ("hash", hash) );`
`572`	`572`
`573`	`573`	`init(check_shutdown);`
	`574`	`+ ilog( "Finished initialization from snapshot" );`
`574`	`575`	`} catch (boost::interprocess::bad_alloc& e) {`
`575`		`- elog( "db storage not configured to have enough storage for the provided snapshot, please increase and retry snapshot" );`
`576`		`- throw e;`
	`576`	`+ elog( "Failed initialization from snapshot - db storage not configured to have enough storage for the provided snapshot, please increase and retry snapshot" );`
	`577`	`+ shutdown();`
`577`	`578`	`}`
`578`	`579`
`579`		`- ilog( "Finished initialization from snapshot" );`
`580`	`580`	`}`
`581`	`581`
`582`	`582`	`void startup(std::function<void()> shutdown, std::function<bool()> check_shutdown, const genesis_state& genesis) {`