Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

v1.7: backport new column families from master #18897

Merged
merged 2 commits into from
Jul 26, 2021

Conversation

CriesofCarrots
Copy link
Contributor

@CriesofCarrots CriesofCarrots commented Jul 26, 2021

Problem

New columns added to master creates ledgers that are incompatible with v1.7, as described in issue #18729.

Summary of Changes

Backport bank_hash and program_costs column families from master to 1.7 for backward compatibility.
Also excludes the stubbed ProgramCosts column from compaction, an oversight that footgunned v1.6 (cc #18840 )

Closes #18724

tao-stones and others added 2 commits July 26, 2021 09:39
* backporting bank_hash and program_costs column families from master to 1.6 for rocksdb backward compatibility

* missed a line to allow dead code

* include code for purge
Copy link
Contributor

@tao-stones tao-stones left a comment

Choose a reason for hiding this comment

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

looks good to me, thanks @CriesofCarrots

@CriesofCarrots CriesofCarrots added the automerge Merge this Pull Request automatically once CI passes label Jul 26, 2021
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 26, 2021
@mergify
Copy link
Contributor

mergify bot commented Jul 26, 2021

automerge label removed due to a CI failure

@CriesofCarrots CriesofCarrots added the automerge Merge this Pull Request automatically once CI passes label Jul 26, 2021
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 26, 2021
@mergify
Copy link
Contributor

mergify bot commented Jul 26, 2021

automerge label removed due to a CI failure

@codecov
Copy link

codecov bot commented Jul 26, 2021

Codecov Report

Merging #18897 (7b8d475) into v1.7 (aedcab8) will decrease coverage by 0.0%.
The diff coverage is 46.4%.

@@            Coverage Diff            @@
##             v1.7   #18897     +/-   ##
=========================================
- Coverage    82.3%    82.3%   -0.1%     
=========================================
  Files         434      434             
  Lines      122714   122773     +59     
=========================================
+ Hits       101035   101081     +46     
- Misses      21679    21692     +13     

@CriesofCarrots CriesofCarrots merged commit 9511031 into solana-labs:v1.7 Jul 26, 2021
@CriesofCarrots CriesofCarrots deleted the v1.7-rocksdb-stubs branch July 28, 2021 22:29
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants