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

Fix GC may delete a already deleted blob file (#168) #169

Merged
merged 2 commits into from
Jun 4, 2020

Conversation

Connor1996
Copy link
Member

Cherry-pick of #168

* add deletefilesinrange during gc case

Signed-off-by: Connor1996 <zbk602423539@gmail.com>

* check obsolete before apply

Signed-off-by: Connor1996 <zbk602423539@gmail.com>
@Connor1996 Connor1996 added the type/cherry-pick Type: PR - Cherry pick label May 29, 2020
@codecov
Copy link

codecov bot commented May 29, 2020

Codecov Report

Merging #169 into tikv-4.x will increase coverage by 0.06%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##           tikv-4.x     #169      +/-   ##
============================================
+ Coverage     85.81%   85.87%   +0.06%     
============================================
  Files            47       47              
  Lines          3553     3555       +2     
============================================
+ Hits           3049     3053       +4     
+ Misses          504      502       -2     

@Connor1996
Copy link
Member Author

/run-unit-test

@Connor1996
Copy link
Member Author

/run-pr

@Connor1996
Copy link
Member Author

test should pass after #172 is merged

@yiwu-arbug yiwu-arbug self-requested a review June 3, 2020 20:47
Copy link
Collaborator

@yiwu-arbug yiwu-arbug left a comment

Choose a reason for hiding this comment

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

LGTM

@Connor1996 Connor1996 added the status/can-merge Status: Can merge to base branch label Jun 4, 2020
@sre-bot
Copy link

sre-bot commented Jun 4, 2020

/run-all-tests

@sre-bot sre-bot merged commit 81814ec into tikv:tikv-4.x Jun 4, 2020
yiwu-arbug pushed a commit to tikv/rust-rocksdb that referenced this pull request Jun 4, 2020
update titan to include tikv/titan#169 for tikv-4.x

include the following changes
```
81814ec 2020-06-04 zbk602423539@gmail.. Fix GC may delete a already deleted blob file (#168) (#169)
80657c0 2020-06-04 zbk602423539@gmail.. Fix wrong assert delta < 0 for cocurrent compaction while flush (#172) (#176)
0db7976 2020-06-04 sre-bot@pingcap.com  Fix wrong live data size when encounter rewrite failure (#161) (#175)
c41f2a2 2020-06-04 sre-bot@pingcap.com  feat: Titan should return user value to compaction filter #163 (#164) (#174)
```

Signed-off-by: sre-bot <sre-bot@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/can-merge Status: Can merge to base branch type/cherry-pick Type: PR - Cherry pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants