From: Andrew Kryczka <andrewkr@fb.com>
Date: Thu, 14 Oct 2021 17:46:37 +0000 (-0700)
Subject: update HISTORY.md and version.h for 6.25.3
X-Git-Tag: v6.25.3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0103296f39ec3fd89b4cdda9687c63fde90eec24;p=rocksdb.git

update HISTORY.md and version.h for 6.25.3
---

diff --git a/HISTORY.md b/HISTORY.md
index 084764a8b..0e25a9061 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,7 +1,9 @@
 # Rocksdb Change Log
-## Unreleased
+## 6.25.3 (2021-10-14)
 ### Bug Fixes
 * Fixed bug in calls to `IngestExternalFiles()` with files for multiple column families. The bug could have introduced a delay in ingested file keys becoming visible after `IngestExternalFiles()` returned. Furthermore, mutations to ingested file keys while they were invisible could have been dropped (not necessarily immediately).
+* Fixed a possible race condition impacting users of `WriteBufferManager` who constructed it with `allow_stall == true`. The race condition led to undefined behavior (in our experience, typically a process crash).
+* Fixed a bug where stalled writes would remain stalled forever after the user calls `WriteBufferManager::SetBufferSize()` with `new_size == 0` to dynamically disable memory limiting.
 
 ## 6.25.2 (2021-10-11)
 ### Bug Fixes
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index 5c35bb19f..be1056dfe 100644
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -11,7 +11,7 @@
 
 #define ROCKSDB_MAJOR 6
 #define ROCKSDB_MINOR 25
-#define ROCKSDB_PATCH 2
+#define ROCKSDB_PATCH 3
 
 // Do not use these. We made the mistake of declaring macros starting with
 // double underscore. Now we have to live with our choice. We'll deprecate these