From bb9f9ccf4fdc1256a31abe634ab882baa6f1c888 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Tue, 18 May 2021 01:30:01 +0200
Subject: [PATCH] core/rawdb: wait for background freezing to exit when closing
 freezer (#22878)

---
 core/rawdb/database.go | 6 +++++-
 core/rawdb/freezer.go  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/rawdb/database.go b/core/rawdb/database.go
index 3a0a26c61..698f1ced8 100644
--- a/core/rawdb/database.go
+++ b/core/rawdb/database.go
@@ -197,7 +197,11 @@ func NewDatabaseWithFreezer(db ethdb.KeyValueStore, freezer string, namespace st
 	}
 	// Freezer is consistent with the key-value database, permit combining the two
 	if !frdb.readonly {
-		go frdb.freeze(db)
+		frdb.wg.Add(1)
+		go func() {
+			frdb.freeze(db)
+			frdb.wg.Done()
+		}()
 	}
 	return &freezerdb{
 		KeyValueStore: db,
diff --git a/core/rawdb/freezer.go b/core/rawdb/freezer.go
index 94b99a64e..ff8919b59 100644
--- a/core/rawdb/freezer.go
+++ b/core/rawdb/freezer.go
@@ -84,6 +84,7 @@ type freezer struct {
 	trigger chan chan struct{} // Manual blocking freeze trigger, test determinism
 
 	quit      chan struct{}
+	wg        sync.WaitGroup
 	closeOnce sync.Once
 }
 
@@ -145,6 +146,8 @@ func (f *freezer) Close() error {
 	var errs []error
 	f.closeOnce.Do(func() {
 		close(f.quit)
+		// Wait for any background freezing to stop
+		f.wg.Wait()
 		for _, table := range f.tables {
 			if err := table.Close(); err != nil {
 				errs = append(errs, err)