Reef: filestore removal by NitzanMordhai · Pull Request #49528 · ceph/ceph

NitzanMordhai · 2022-12-21T05:56:33Z

FileStore depreciation for Reef - Updated or new installed OSDs will no longer be able to start with FileStore.
Since FileStore will be depreciated, we have few tests for FileStore that can be removed and some tools that need to be adjusting to use BlueStore or remove some functionality that no longer needed.

Contribution Guidelines

To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "pacific"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.

Checklist

Tracker (select at least one)
- References tracker ticket
- Very recent bug; references commit where it was introduced
- New feature (ticket optional)
- Doc update (no ticket needed)
- Code cleanup (no ticket needed)
Component impact
- Affects Dashboard, opened tracker ticket
- Affects Orchestrator, opened tracker ticket
- No impact that needs to be tracked
Documentation (select at least one)
- Updates relevant documentation
- No doc update is appropriate
Tests (select at least one)
- Includes unit test(s)
- Includes integration test(s)
- Includes bug reproducer
- No tests

Show available Jenkins commands

jenkins retest this please
jenkins test classic perf
jenkins test crimson perf
jenkins test signed
jenkins test make check
jenkins test make check arm64
jenkins test submodules
jenkins test dashboard
jenkins test dashboard cephadm
jenkins test api
jenkins test docs
jenkins render docs
jenkins test ceph-volume all
jenkins test ceph-volume tox
jenkins test windows

aclamk · 2022-12-21T07:50:05Z

qa/suites/rados/objectstore/backends/alloc-hint.yaml

        filestore xfs extsize: true
-        osd objectstore: filestore
+        osd objectstore: bluestore
        osd op queue: wpq


I think this file should just be removed.

That means I can remove also test_alloc_hint.sh ?

qa/suites/rados/objectstore/backends/ceph_objectstore_tool.yaml

aclamk · 2022-12-21T08:05:35Z

src/test/objectstore/store_test.cc

  StoreTest,
  ::testing::Values(
    "memstore",
-    "filestore",


This change requires shifting of --gtest_filter parametes in
qa/suites/rados/objectstore/backends/* files where ceph_test_objectstore is called.
For example --gtest_filter=*/2:-*SyntheticMatrixC* no longer means bluestore but kstore.

rzarzynski · 2022-12-22T11:07:50Z

qa/tasks/ceph.py

+		    args = [
+                        'sudo',
+                        'egrep', pattern,
+                        '/var/log/ceph/{cluster}.log'.format(cluster=cluster),


I doubt we'll have an access the monitor at time when OSD calls ObjectStore::create() – MonClient is instantiated later.

Changing to egrep from osds logs

rzarzynski · 2022-12-22T11:08:57Z

22+k SLOCs removed :-D.

NitzanMordhai · 2023-01-20T07:39:03Z

jenkins test make check

idryomov

Some leftovers that I have spotted:

hadoop suite has a dangling filestore-xfs.yaml symlink (not sure if anyone ran this suite in recent years though)
ceph_volume suite has a big number of filestore facets which pass osd_objectstore: "filestore"
https://docs.ceph.com/en/latest/rados/configuration/filestore-config-ref/ page needs to go ("... though Filestore OSDs are still supported" claim)

NitzanMordhai · 2023-02-09T05:58:45Z

hadoop suite has a dangling filestore-xfs.yaml symlink (not sure if anyone ran this suite in recent years though)

Removed

ceph_volume suite has a big number of filestore facets which pass osd_objectstore: "filestore"
I didn't even notice there are suites over that path! Thanks Removed!

NitzanMordhai · 2023-02-09T06:00:53Z

https://docs.ceph.com/en/latest/rados/configuration/filestore-config-ref/ page needs to go ("... though Filestore OSDs are still supported" claim)

It looks like the docs will need extra care, how about letting that PR pass and then handle the docs? i'll open new PR for it, if thats ok with you all @idryomov @rzarzynski @idryomov @aclamk @neha-ojha

idryomov · 2023-02-09T09:26:08Z

It looks like the docs will need extra care, how about letting that PR pass and then handle the docs?

Sure, a separate docs PR to remove all references to Filestore sounds good to me.

BTW there are now over 20 commits in this PR. Please squash all pure code removal commits, if a few lines are adjusted in some test case it doesn't need a separate commit either, etc.

NitzanMordhai · 2023-02-09T12:01:38Z

BTW there are now over 20 commits in this PR. Please squash all pure code removal commits, if a few lines are adjusted in some test case it doesn't need a separate commit either, etc.

Done, thanks!

idryomov · 2023-02-09T13:09:52Z

Was "Rados\suites: change all osd objectstore filestore" meant to contain a backslash? I'd rename it to "qa/suites: change all osd objectstore filestore" and squash the ceph-volume commit into it as well (since it's also a suite).

Removing and changing all suites to no longer use filestore Signed-off-by: Nitzan Mordechai <nmordec@redhat.com> ceph_volume: remove all filestore tests suites Since filestore removed, no need to test it Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>

When upgrading osd with filestore to reef, restart should not be possible the osd won't boot and error message will be showed in the osd log Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>

…setting Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>

- test_trans convert FileStore to BlueStore test - xattr_bench convert FileStore to BlueStore usage - remove test_idempotent_sequence tests - remove test_idempotent - remove test_filejournal - removing filestore tests from store_test - remove rep_read_unfound test for filestore only - remove osd-dup convert filestore to bluestore - osd-scrub-repair start only bluestore osd - osd-pool-create remove filestore expected_num_object test - Remove chain_xattr and LFNIndex uneeded test Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>

ObjectStore will no longer create new FileStore object store and OSD will terminate dencoder: remove filestore remove filestore headers and change some location for other non related filestore headers tools: ceph-objectstore-tool remove filestore functions Removing un-needed options after depreciting filestore tools: Change DBObjectMap location change header path after depreciting filestore FileStore: Delete folders, files and CMake entries from os depreciting filestore files and CMake entries Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>

NitzanMordhai · 2023-02-12T06:12:49Z

Was "Rados\suites: change all osd objectstore filestore" meant to contain a backslash? I'd rename it to "qa/suites: change all osd objectstore filestore" and squash the ceph-volume commit into it as well (since it's also a suite).

Done

NitzanMordhai · 2023-02-21T05:26:11Z

jenkins test api

NitzanMordhai · 2023-02-21T06:05:54Z

jenkins test api

idryomov

Ack from the RBD perspective!

We do have some Filestore-specific bits in librbd such as below but they are staying for a long time to come for handling older OSDs.

ceph/src/librbd/io/ImageRequest.cc

Lines 619 to 634 in 01ad87e

    
           // discard_granularity_bytes >= object_size && tail truncation 
        
           // is a special case for filestore 
        
           bool prune_required = false; 
        
           bool length_modified = false; 
        
           auto object_size = this->m_image_ctx.layout.object_size; 
        
           auto discard_granularity_bytes = std::min(m_discard_granularity_bytes, 
        
                                                     object_size); 
        
           auto xform_lambda = 
        
             [discard_granularity_bytes, object_size, &prune_required, &length_modified] 
        
             (LightweightObjectExtent& object_extent) { 
        
               auto& offset = object_extent.offset; 
        
               auto& length = object_extent.length; 
        
               auto next_offset = offset + length; 
        
               if ((discard_granularity_bytes < object_size) || 
        
                   (next_offset < object_size)) {

github-actions bot added build/ops core tests labels Dec 21, 2022

NitzanMordhai force-pushed the wip-nitzan-filestore-removal branch from ecf8837 to d00e7a3 Compare December 21, 2022 06:11

NitzanMordhai requested review from aclamk, neha-ojha and rzarzynski December 21, 2022 06:14

aclamk reviewed Dec 21, 2022

View reviewed changes

qa/suites/rados/objectstore/backends/ceph_objectstore_tool.yaml Show resolved Hide resolved

aclamk reviewed Dec 21, 2022

View reviewed changes

NitzanMordhai force-pushed the wip-nitzan-filestore-removal branch 8 times, most recently from 2697989 to a820161 Compare December 22, 2022 10:27

rzarzynski reviewed Dec 22, 2022

View reviewed changes

NitzanMordhai force-pushed the wip-nitzan-filestore-removal branch 6 times, most recently from 7103f00 to 99e44ea Compare December 25, 2022 08:42

NitzanMordhai requested review from aclamk and rzarzynski December 25, 2022 08:55

NitzanMordhai force-pushed the wip-nitzan-filestore-removal branch 2 times, most recently from 6774a2c to 7323a7c Compare December 25, 2022 10:05

yuriw added wip-yuri4-testing wip-yuri6-testing and removed wip-yuri4-testing labels Jan 19, 2023

NitzanMordhai force-pushed the wip-nitzan-filestore-removal branch from eb381b9 to 5128ffc Compare January 19, 2023 18:44

NitzanMordhai force-pushed the wip-nitzan-filestore-removal branch 3 times, most recently from b4a4a32 to 0e1f13c Compare January 26, 2023 17:35

NitzanMordhai requested a review from a team as a code owner January 26, 2023 17:35

NitzanMordhai force-pushed the wip-nitzan-filestore-removal branch from 0e1f13c to c30fa88 Compare February 5, 2023 11:02

idryomov reviewed Feb 8, 2023

View reviewed changes

NitzanMordhai force-pushed the wip-nitzan-filestore-removal branch from c30fa88 to 271cccb Compare February 9, 2023 06:01

NitzanMordhai requested a review from a team as a code owner February 9, 2023 06:01

NitzanMordhai added 5 commits February 12, 2023 06:11

rados: upgrade suite test filestore removal

d8202bc

When upgrading osd with filestore to reef, restart should not be possible the osd won't boot and error message will be showed in the osd log Signed-off-by: Nitzan Mordechai <nmordec@redhat.com>

ceph_manager: removing filestore objectstore-tools file apply-layout-…

5008369

…setting Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>

rzarzynski approved these changes Feb 21, 2023

View reviewed changes

idryomov approved these changes Feb 21, 2023

View reviewed changes

cbodley mentioned this pull request Mar 2, 2023

rgw/s3select: json integration: identifying new data-source and execute a JSON flow. #49411

Merged

14 tasks

pdvian mentioned this pull request May 19, 2023

mon: remove filestore #51456

Merged

14 tasks

	// discard_granularity_bytes >= object_size && tail truncation
	// is a special case for filestore
	bool prune_required = false;
	bool length_modified = false;
	auto object_size = this->m_image_ctx.layout.object_size;
	auto discard_granularity_bytes = std::min(m_discard_granularity_bytes,
	object_size);
	auto xform_lambda =
	[discard_granularity_bytes, object_size, &prune_required, &length_modified]
	(LightweightObjectExtent& object_extent) {
	auto& offset = object_extent.offset;
	auto& length = object_extent.length;
	auto next_offset = offset + length;

	if ((discard_granularity_bytes < object_size) \|\|
	(next_offset < object_size)) {

Conversation

NitzanMordhai commented Dec 21, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contribution Guidelines

Checklist

Uh oh!

aclamk Dec 21, 2022

Choose a reason for hiding this comment

Uh oh!

NitzanMordhai Dec 21, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

aclamk Dec 21, 2022

Choose a reason for hiding this comment

Uh oh!

NitzanMordhai Dec 21, 2022

Choose a reason for hiding this comment

Uh oh!

rzarzynski Dec 22, 2022

Choose a reason for hiding this comment

Uh oh!

NitzanMordhai Dec 23, 2022

Choose a reason for hiding this comment

Uh oh!

rzarzynski commented Dec 22, 2022

Uh oh!

NitzanMordhai commented Jan 20, 2023

Uh oh!

idryomov left a comment

Choose a reason for hiding this comment

Uh oh!

NitzanMordhai commented Feb 9, 2023

Uh oh!

NitzanMordhai commented Feb 9, 2023

Uh oh!

idryomov commented Feb 9, 2023

Uh oh!

NitzanMordhai commented Feb 9, 2023

Uh oh!

idryomov commented Feb 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NitzanMordhai commented Feb 12, 2023

Uh oh!

NitzanMordhai commented Feb 21, 2023

Uh oh!

NitzanMordhai commented Feb 21, 2023

Uh oh!

idryomov left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

NitzanMordhai commented Dec 21, 2022 •

edited

Loading

idryomov commented Feb 9, 2023 •

edited

Loading