Skip to content

Conversation

@ddanielr
Copy link
Contributor

Modifies isPropertySet to also check the parent config if it exists.

@ddanielr ddanielr merged commit 4c3085b into apache:2.1 Dec 22, 2023
@ddanielr ddanielr deleted the update-configurationCopy branch December 22, 2023 18:48
ctubbsii added a commit to ctubbsii/accumulo that referenced this pull request Dec 23, 2023
asfgit pushed a commit that referenced this pull request Dec 23, 2023
ctubbsii added a commit to ctubbsii/accumulo that referenced this pull request Dec 23, 2023
This is a reapplication of apache#4092 after it was reverted without apache#4112,
and using ctubbsii's use of SiteConfiguration for testing overrides
rather than modifications to ConfigurationCopy

* Add tests for maxOpen to override open.max

Adds a test to ensure that setting the maxOpen option for a compaction
service will override the deprecated `open.max` property if set.

Condenses helper methods in planner tests

Uses CompactionPlannerInitParams for tests instead of custom test code

Modifies the ConfigurationCopy class to accept a parent conf to allow
  for testing user set properties vs default values in test cases

Adds test case for default compaction service used with deprecated
  property

Removes hardcoded maxOpen value with reference to default property value

Modifies the getFullyQualifiedOption to return the correct path for the
`<service>.planner.opts.` properties.

Use SiteConfiguration to test overrides (contributed by ctubbsii)

Use SiteConfiguration with overrides, instead of ConfigurationCopy, to
test override behavior for DefaultCompactionPlannerTest, preserving
ConfigurationCopy's role as a simple "flat" configuration object for
testing and simple operations.

Co-authored-by: Christopher Tubbs <ctubbsii@apache.org>
@ctubbsii
Copy link
Member

Reverted this in a12f517 ; it's OBE with reapplying #4092 in #4117

ctubbsii added a commit to ctubbsii/accumulo that referenced this pull request Dec 23, 2023
This fixes a bug in the compaction properties to ensure the replacement
property is always preferred over the deprecated open.max compaction
property when it is set.

Add tests for maxOpen to override open.max:
* Adds a test to ensure that setting the maxOpen option for a compaction
  service will override the deprecated `open.max` property if set
* Condenses helper methods in planner tests
* Uses CompactionPlannerInitParams for tests instead of custom test code
* Adds test case for default compaction service used with deprecated
  property
* Removes hardcoded maxOpen value with reference to default property
  value
* Modifies the getFullyQualifiedOption to return the correct path for
  the `<service>.planner.opts.` properties

This is a reapplication of apache#4092 after it was reverted, to use
SiteConfiguration for testing overrides rather than modifications to
ConfigurationCopy

Changes made by ctubbsii that diverge from apache#4092:
* Update commit log message to add detail and format it
* Omit changes to ConfigurationCopy, including changes in apache#4112, which
  is now OBE, to add a parent to preserve its role as a simple "flat"
  configuration object for testing and simple operations
* Use SiteConfiguration with overrides, instead of ConfigurationCopy
  with a parent, to test override behavior for
  DefaultCompactionPlannerTest

Co-authored-by: Christopher Tubbs <ctubbsii@apache.org>
ddanielr added a commit that referenced this pull request Dec 27, 2023
This fixes a bug in the compaction properties to ensure the replacement
property is always preferred over the deprecated open.max compaction
property when it is set.

Add tests for maxOpen to override open.max:
* Adds a test to ensure that setting the maxOpen option for a compaction
  service will override the deprecated `open.max` property if set
* Condenses helper methods in planner tests
* Uses CompactionPlannerInitParams for tests instead of custom test code
* Adds test case for default compaction service used with deprecated
  property
* Removes hardcoded maxOpen value with reference to default property
  value
* Modifies the getFullyQualifiedOption to return the correct path for
  the `<service>.planner.opts.` properties

This is a reapplication of #4092 after it was reverted, to use
SiteConfiguration for testing overrides rather than modifications to
ConfigurationCopy

Changes made by ctubbsii that diverge from #4092:
* Update commit log message to add detail and format it
* Omit changes to ConfigurationCopy, including changes in #4112, which
  is now OBE, to add a parent to preserve its role as a simple "flat"
  configuration object for testing and simple operations
* Use SiteConfiguration with overrides, instead of ConfigurationCopy
  with a parent, to test override behavior for
  DefaultCompactionPlannerTest

Co-authored-by: Daniel Roberts <ddanielr@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants