Merge pull request #3879 from steveax/doc-latest

Merge branch 'main' into doc-latest

documentation/api/query/v4/query.markdown

@@ -115,6 +115,19 @@ would be recorded as a string like
 
 For a walkthrough on constructing queries, see [the query tutorial page][tutorial]. For quick tips on using curl to make ad hoc queries, see [the curl tips page][curl].
 
+## Experimental query termination
+
+PuppetDB now monitors all queries for client disconnects, and
+terminates the query (including the database work) as soon as the
+client is gone. The same mechanism also helps enforce relevant query
+timeouts promptly.
+
+For now, this subsystem can be disabled by setting the environment
+variable `PDB_PROMPTLY_END_QUERIES` to `false`, which might be helpful
+if you encounter
+[this issue with PuppetDB 8.1.0](https://github.com/puppetlabs/puppetdb/issues/3866),
+but the variable is likely to be removed in a future release.
+
 ## Experimental query optimization
 
 > *Note*: this feature is experimental and may be altered or removed

documentation/overview.markdown

@@ -74,10 +74,11 @@ Puppet provides PuppetDB packages and a module which simplify the
 setup of its SSL certificates and init scripts. The packages are
 available for the following operating systems:
 
-* Red Hat Enterprise Linux 7, and 8
-* SuSE Enterprise Linux 12
-* Debian 10 (Buster), 11 (Bullseye)
-* Ubuntu 18.04 (Bionic) LTS, and 20.04 (Focal) LTS
+* Red Hat Enterprise Linux 7, 8, and 9
+* SuSE Enterprise Linux 12, 15
+* Debian 10 (Buster), and 11 (Bullseye)
+* Ubuntu 18.04 (Bionic) LTS, 20.04 (Focal), 22.04 (Jammy) LTS
+
 
 [See here for instructions for installing via the PuppetDB module.][install_via_module]
 

documentation/release_notes_7.markdown

@@ -21,18 +21,23 @@ Released August 22 2023
 
 ## New features and improvements
 
-* Add el-9 as supported platform
- [PDB-5671](https://perforce.atlassian.net/browse/PDB-5671)
+* RedHat Enterprise Linux 9 (RHEL 9) has been added as a supported
+ platform. ([PDB-5671](https://perforce.atlassian.net/browse/PDB-5671))
 
-* PQL parsing of OR clauses can result in OOM errors
- [PDB-5643](https://perforce.atlassian.net/browse/PDB-5643)
+* Ubuntu 22.04 has been added as a supported platform.
+ ([PDB-5636](https://perforce.atlassian.net/browse/PDB-5636))
 
-* Add ubuntu 2204 as supported platform
- [PDB-5636](https://perforce.atlassian.net/browse/PDB-5636)
+### Bug fixes
+
+* Some PQL queries with numerous `or` clauses should no longer cause
+ PuppetDB to run out of memory. Previously they could allocate an
+ exorbitant amount of RAM.
+ ([GitHub #3874](https://github.com/puppetlabs/puppetdb/issues/3874))
 
 ### Contributors
 
-Austin Blatt, Nick Burgan-Illig, Jonathan Newman, Eric Newton, Joshua Partlow, Steve Axthelm, and Rob Browning
+Austin Blatt, Nick Burgan-Illig, Jonathan Newman, Eric Newton, Joshua
+Partlow, Steve Axthelm, and Rob Browning
 
 ## PuppetDB 7.13.1
 

documentation/release_notes_8.markdown

@@ -11,30 +11,66 @@ canonical: "/puppetdb/latest/release_notes.html"
 
 # PuppetDB: Release notes
 
+## PuppetDB 8.1.1
+
+Released September 14 2023
+
+### Bug fixes
+
+* PuppetDB should no longer throw a `CancelledKeyException` when a
+ network connection is reused for multiple queries (originally
+ noticed in the 8.1.0 release).
+ ([GitHub #3866](https://github.com/puppetlabs/puppetdb/issues/3866))
+
+### Contributors
+
+Austin Blatt, Ingrida Cazers, Josh Partlow, Rob Browning, and
+Steve Axthelm
+
 ## PuppetDB 8.1.0
 
 Released August 22 2023
 
 ## New features and improvements
 
-* Add el-9 as supported platform
- [PDB-5667](https://perforce.atlassian.net/browse/PDB-5667)
+* RedHat Enterprise Linux 9 (RHEL 9) has been added as a supported
+ platform.
+ ([PDB-5667](https://perforce.atlassian.net/browse/PDB-5667))
+
+* Ubuntu 22.04 has been added as a supported platform.
+ ([PDB-5636](https://perforce.atlassian.net/browse/PDB-5636))
+
+* PuppetDB will now abandon queries more promptly when a client
+ disconnects. Previously an expensive query could continue running
+ indefinitely. The same mechanism should also help ensure query
+ timeouts are immediately enforced.
+ ([GitHub #3867](https://github.com/puppetlabs/puppetdb/issues/3867))
+
+* When no database migrations are pending, PuppetDB will no longer
+ disconnect clients on restart.
+ ([PE-36120](https://perforce.atlassian.net/browse/PE-36120))
 
-* Add ubuntu 22.04 as supported platform
- [PDB-5636](https://perforce.atlassian.net/browse/PDB-5636)
+### Bug fixes
 
-* Abandon queries when client disconnects
- [PDB-5645](https://perforce.atlassian.net/browse/PDB-5645)
+* Some PQL queries with numerous `or` clauses should no longer cause
+ PuppetDB to run out of memory. Previously they could allocate an
+ exorbitant amount of RAM.
+ ([GitHub #3874](https://github.com/puppetlabs/puppetdb/issues/3874))
 
-* PQL parsing of OR clauses can result in OOM errors
- [PDB-5643](https://perforce.atlassian.net/browse/PDB-5643)
+### Known issues
 
-* Restarts of PuppetDB on the primary kill database connections on compilers when no migrations are pending
- [PDB-36120](https://perforce.atlassian.net/browse/PDB-36120)
+* The mechanism used to abandon queries and enforce timeouts mentioned
+ above may throw a `CancelledKeyException` when a network connection
+ is reused for multiple queries. For the time being, the problem can
+ be addressed by setting the experimental environment variable
+ `PDB_PROMPTLY_END_QUERIES` to `false`. (This variable may be
+ removed in a future release.)
+ ([GitHub #3866](https://github.com/puppetlabs/puppetdb/issues/3866))
 
 ### Contributors
 
-Austin Blatt, Nick Burgan-Illig, Jonathan Newman, Eric Newton, Joshua Partlow, Steve Axthelm, and Rob Browning
+Austin Blatt, Nick Burgan-Illig, Jonathan Newman, Eric Newton, Joshua
+Partlow, Steve Axthelm, and Rob Browning
 
 ## PuppetDB 8.0.1
 

project.clj

@@ -1,4 +1,4 @@
-(def pdb-version "8.1.1-SNAPSHOT")
+(def pdb-version "8.1.2-SNAPSHOT")
 
 (def clj-parent-version "7.1.1")