Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/issue 2695 rev tree pruning tombstoned branch #2697

Merged
merged 3 commits into from
Jun 29, 2017

Conversation

tleyden
Copy link
Contributor

@tleyden tleyden commented Jun 28, 2017

Fixes #2695

#2695 (comment) explains the bug.

Unit tests against couchbase server bucket (in progress)

Functional test re-run (pending)

@sethrosetter can you check the pending functional test cen7-sync-gateway-functional-tests-base-cc/790 and see if that looks correct?

@sethrosetter
Copy link
Contributor

@tleyden The test failed due to a test framework issue. We added some version compatibility checks a few weeks ago that is causing source provisioning to fail. Are you able to run the test locally to verify until will can fix this?

@tleyden
Copy link
Contributor Author

tleyden commented Jun 29, 2017

@sethrosetter yup, already verified locally.

Copy link

@ajres ajres left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although I'm not familiar with the code context, the delta changes look good to me.

@ajres ajres merged commit 933d652 into master Jun 29, 2017
@ajres ajres removed the in progress label Jun 29, 2017
tleyden added a commit that referenced this pull request Jun 29, 2017
* Add failing test TestPruneRevsSingleTombstonedBranch()

* Fix issue by only setting tombstoneGenerationThreshold if tree.FindShortestNonTombstonedBranch returned valid generation

* Remove import

# Conflicts:
#	db/revtree.go
#	db/revtree_test.go
tleyden added a commit that referenced this pull request Jul 17, 2017
* Add failing test TestPruneRevsSingleTombstonedBranch()

* Fix issue by only setting tombstoneGenerationThreshold if tree.FindShortestNonTombstonedBranch returned valid generation

* Remove import
tleyden pushed a commit that referenced this pull request Jul 26, 2017
Cherry pick from master branch commit 933d652

* Add failing test TestPruneRevsSingleTombstonedBranch()

* Fix issue by only setting tombstoneGenerationThreshold if tree.FindShortestNonTombstonedBranch returned valid generation

* Remove import
@bbrks bbrks deleted the feature/issue_2695_rev_tree_pruning_tombstoned_branch branch August 1, 2019 10:21
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