Commit 9dd9d21c authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'rnou/289-dlio_benchmark-hangs-wip' into 'master' 

Resolve "dlio_benchmark  hangs (WIP)"

Change the assert (mentioned in the issue) from < to <=. This enables, truncate to work that is something that dlio does. This affects only debug compilations.

Closes #289

Closes #289

See merge request !208
parents 5e87cfa7 e3d5f44b

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). 
### New

### Changed

- Unify dependency scripts (dl and compile): Unify `-d` and `-p` flags ([!174](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/174)).

- Increased merge assert for files with size 0, specific for DLIO with GekkoFS in Debug ([!208])(https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/208)).

### Removed

### Fixed

src/daemon/backend/metadata/merge.cpp

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ MetadataMergeOperator::FullMergeV2(const MergeOperationInput& merge_in, 
            }

        } else if(operand_id == OperandID::decrease_size) {

            auto op = DecreaseSizeOperand(parameters);

            assert(op.size() < fsize); // we assume no concurrency here

            assert(op.size() <= fsize); // we assume no concurrency here

            fsize = op.size();

        } else if(operand_id == OperandID::create) {

            continue;