gemmellr commented on code in PR #5128:
URL: https://github.com/apache/activemq-artemis/pull/5128#discussion_r1705764377
##########
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java:
##########
@@ -228,11 +228,34 @@ private void configureSizeMetric() {
size.setMax(maxSize, maxSize, maxMessages, maxMessages);
}
+ private boolean validateNewSettings(final AddressSettings addressSettings) {
+
+ Long newPageLimitBytes = addressSettings.getPageLimitBytes();
+
+ if (newPageLimitBytes != null && newPageLimitBytes.longValue() < 0) {
+ newPageLimitBytes = null;
+ }
+ int newPageSize =
storageManager.getAllowedPageSize(addressSettings.getPageSizeBytes());
+ if (newPageLimitBytes != null && newPageSize > 0) {
+ long newEstimatedMaxPages = newPageLimitBytes / newPageSize;
+ if (this.numberOfPages > newEstimatedMaxPages) {
+ ActiveMQServerLogger.LOGGER.pageSettingsFailedApply(storeName,
addressSettings, "estimated max pages " + newEstimatedMaxPages + " is less than
current number of pages " + this.numberOfPages);
+ return false;
+ }
+ }
+ return true;
+ }
+
/**
* @param addressSettings
*/
@Override
public void applySetting(final AddressSettings addressSettings) {
+
+ if (!validateNewSettings(addressSettings)) {
+ return;
+ }
Review Comment:
Another thing I realised is that the page size is adjusted further down this
method for the JDBC use case. So validating the value at the start of this
method, before that later change occurs, is likely to give the wrong behaviour.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
