Skip to content

os, osd: drop remainings of FileStore#65270

Open
rzarzynski wants to merge 6 commits intoceph:mainfrom
rzarzynski:wip-os-filestore-cleanup
Open

os, osd: drop remainings of FileStore#65270
rzarzynski wants to merge 6 commits intoceph:mainfrom
rzarzynski:wip-os-filestore-cleanup

Conversation

@rzarzynski
Copy link
Contributor

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. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.

  • When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

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)
Show available Jenkins commands

@github-actions
Copy link

github-actions bot commented Aug 27, 2025

Config Diff Tool Output

- removed: filestore_max_xattr_value_size_xfs (global.yaml.in)
- removed: filestore_fsync_flushes_journal_data (global.yaml.in)
- removed: filestore_journal_parallel (global.yaml.in)
- removed: filestore_wbthrottle_xfs_inodes_start_flusher (global.yaml.in)
- removed: filestore_zfs_snap (global.yaml.in)
- removed: filestore_ondisk_finisher_threads (global.yaml.in)
- removed: filestore_split_multiple (global.yaml.in)
- removed: filestore_fail_eio (global.yaml.in)
- removed: filestore_queue_max_delay_multiple (global.yaml.in)
- removed: filestore_wbthrottle_btrfs_inodes_start_flusher (global.yaml.in)
- removed: filestore_omap_header_cache_size (global.yaml.in)
- removed: filestore_xfs_extsize (global.yaml.in)
- removed: filestore_fiemap_threshold (global.yaml.in)
- removed: filestore_max_xattr_value_size_other (global.yaml.in)
- removed: filestore_wbthrottle_btrfs_bytes_start_flusher (global.yaml.in)
- removed: filestore_rocksdb_options (global.yaml.in)
- removed: filestore_omap_backend (global.yaml.in)
- removed: filestore_odsync_write (global.yaml.in)
- removed: filestore_min_sync_interval (global.yaml.in)
- removed: filestore_queue_high_delay_multiple_ops (global.yaml.in)
- removed: filestore_wbthrottle_xfs_ios_hard_limit (global.yaml.in)
- removed: filestore_max_xattr_value_size_btrfs (global.yaml.in)
- removed: filestore_max_inline_xattrs (global.yaml.in)
- removed: filestore_apply_finisher_threads (global.yaml.in)
- removed: filestore_wbthrottle_xfs_bytes_hard_limit (global.yaml.in)
- removed: filestore_max_inline_xattr_size_btrfs (global.yaml.in)
- removed: filestore_seek_data_hole (global.yaml.in)
- removed: filestore_split_rand_factor (global.yaml.in)
- removed: filestore_max_inline_xattr_size_other (global.yaml.in)
- removed: filestore_sloppy_crc_block_size (global.yaml.in)
- removed: filestore_max_xattr_value_size (global.yaml.in)
- removed: filestore_dump_file (global.yaml.in)
- removed: filestore_op_thread_timeout (global.yaml.in)
- removed: filestore_debug_inject_read_err (global.yaml.in)
- removed: filestore_blackhole (global.yaml.in)
- removed: filestore_collect_device_partition_information (global.yaml.in)
- removed: filestore_journal_trailing (global.yaml.in)
- removed: filestore_queue_high_delay_multiple_bytes (global.yaml.in)
- removed: filestore_wbthrottle_btrfs_ios_hard_limit (global.yaml.in)
- removed: filestore_queue_max_bytes (global.yaml.in)
- removed: filestore_sloppy_crc (global.yaml.in)
- removed: filestore_queue_high_delay_multiple (global.yaml.in)
- removed: filestore_queue_high_threshhold (global.yaml.in)
- removed: filestore_op_thread_suicide_timeout (global.yaml.in)
- removed: filestore_fd_cache_shards (global.yaml.in)
- removed: filestore_max_alloc_hint_size (global.yaml.in)
- removed: filestore_fd_cache_size (global.yaml.in)
- removed: filestore_queue_low_threshhold (global.yaml.in)
- removed: filestore_inject_stall (global.yaml.in)
- removed: filestore_expected_throughput_bytes (global.yaml.in)
- removed: filestore_max_sync_interval (global.yaml.in)
- removed: filestore_queue_max_delay_multiple_bytes (global.yaml.in)
- removed: filestore_btrfs_snap (global.yaml.in)
- removed: filestore_journal_writeahead (global.yaml.in)
- removed: filestore_caller_concurrency (global.yaml.in)
- removed: filestore_wbthrottle_xfs_inodes_hard_limit (global.yaml.in)
- removed: filestore_index_retry_probability (global.yaml.in)
- removed: filestore_max_inline_xattr_size (global.yaml.in)
- removed: filestore_max_inline_xattrs_btrfs (global.yaml.in)
- removed: filestore_merge_threshold (global.yaml.in)
- removed: filestore_queue_max_delay_multiple_ops (global.yaml.in)
- removed: filestore_op_threads (global.yaml.in)
- removed: filestore_punch_hole (global.yaml.in)
- removed: filestore_wbthrottle_btrfs_inodes_hard_limit (global.yaml.in)
- removed: filestore_update_to (global.yaml.in)
- removed: filestore_omap_backend_path (global.yaml.in)
- removed: filestore_wbthrottle_enable (global.yaml.in)
- removed: filestore_fadvise (global.yaml.in)
- removed: filestore_debug_verify_split (global.yaml.in)
- removed: filestore_splice (global.yaml.in)
- removed: filestore_debug_omap_check (global.yaml.in)
- removed: filestore_kill_at (global.yaml.in)
- removed: filestore_fiemap (global.yaml.in)
- removed: filestore_btrfs_clone_range (global.yaml.in)
- removed: filestore_max_inline_xattr_size_xfs (global.yaml.in)
- removed: filestore_wbthrottle_btrfs_ios_start_flusher (global.yaml.in)
- removed: filestore_wbthrottle_xfs_bytes_start_flusher (global.yaml.in)
- removed: filestore_wbthrottle_btrfs_bytes_hard_limit (global.yaml.in)
- removed: filestore_queue_max_ops (global.yaml.in)
- removed: filestore_wbthrottle_xfs_ios_start_flusher (global.yaml.in)
- removed: filestore_max_inline_xattrs_xfs (global.yaml.in)
- removed: filestore_max_inline_xattrs_other (global.yaml.in)
- removed: filestore_expected_throughput_ops (global.yaml.in)
- removed: filestore_commit_timeout (global.yaml.in)
! changed: osd_objectstore: old: ['bluestore', 'filestore', 'memstore', 'kstore', 'seastore', 'cyanstore'] (global.yaml.in)
! changed: osd_objectstore: new: ['bluestore', 'memstore', 'kstore', 'seastore', 'cyanstore'] (global.yaml.in)

The above configuration changes are found in the PR. Please update the relevant release documentation if necessary.
Ignore this comment if docs are already updated. To make the "Check ceph config changes" CI check pass, please comment /config check ok and re-run the test.

@rzarzynski rzarzynski force-pushed the wip-os-filestore-cleanup branch from cb49f43 to a428a5b Compare August 27, 2025 20:38
@github-actions github-actions bot added the tests label Aug 27, 2025
@rzarzynski rzarzynski force-pushed the wip-os-filestore-cleanup branch from a428a5b to 5c864ce Compare August 28, 2025 05:03
@rzarzynski rzarzynski marked this pull request as ready for review August 28, 2025 11:01
@rzarzynski rzarzynski requested a review from a team as a code owner August 28, 2025 11:01
@jdurgin
Copy link
Member

jdurgin commented Sep 3, 2025

Grepping shows a bunch of docs still referencing filestore as well

@github-actions
Copy link

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
@rzarzynski rzarzynski force-pushed the wip-os-filestore-cleanup branch from 5c864ce to a5957cd Compare October 13, 2025 10:36
@rzarzynski
Copy link
Contributor Author

Rebased after a trival conflict with e714636.

@amathuria
Copy link
Contributor

@rzarzynski
This test might need to be removed as well - https://github.com/ceph/ceph/blob/main/qa/workunits/cephtool/test.sh#L2684

function test_osd_negative_filestore_merge_threshold()
{
  $SUDO ceph daemon osd.0 config set filestore_merge_threshold -1
  expect_config_value "osd.0" "filestore_merge_threshold" -1
}

Failure - https://pulpito.ceph.com/skanta-2025-10-15_06:49:42-rados-wip-bharath1-testing-2025-10-14-1448-distro-default-smithi/8552753/

@JonBailey1993
Copy link
Contributor

Hey @rzarzynski, we came across a couple related failures during teuthology qa:

There were a few teuthology runs which look like they are trying to access a now deleted filestore config value:

/a/skanta-2025-11-05_00:00:19-rados-wip-bharath7-testing-2025-11-04-1337-distro-default-smithi/8584403
/a/skanta-2025-11-05_00:00:19-rados-wip-bharath7-testing-2025-11-04-1337-distro-default-smithi/8584411
/a/skanta-2025-11-05_00:00:19-rados-wip-bharath7-testing-2025-11-04-1337-distro-default-smithi/8584422
/a/skanta-2025-11-05_00:00:19-rados-wip-bharath7-testing-2025-11-04-1337-distro-default-smithi/8584433
/a/skanta-2025-11-05_00:00:19-rados-wip-bharath7-testing-2025-11-04-1337-distro-default-smithi/8584441
/a/skanta-2025-11-04_12:15:02-rados-wip-bharath7-testing-2025-11-04-1337-distro-default-smithi/8582261
/a/skanta-2025-11-04_12:15:02-rados-wip-bharath7-testing-2025-11-04-1337-distro-default-smithi/8582325
/a/skanta-2025-11-04_12:15:02-rados-wip-bharath7-testing-2025-11-04-1337-distro-default-smithi/8582384
/a/skanta-2025-11-04_12:15:02-rados-wip-bharath7-testing-2025-11-04-1337-distro-default-smithi/8582443
/a/skanta-2025-11-04_12:15:02-rados-wip-bharath7-testing-2025-11-04-1337-distro-default-smithi/8582505

2025-11-05T05:18:38.192 INFO:tasks.workunit.client.0.smithi039.stderr:/home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:3101: :  test_osd_negative_filestore_merge_threshold
2025-11-05T05:18:38.192 INFO:tasks.workunit.client.0.smithi039.stderr:/home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:2686: test_osd_negative_filestore_merge_threshold:  sudo ceph daemon osd.0 config set filestore_merge_threshold -1
2025-11-05T05:18:38.303 INFO:tasks.workunit.client.0.smithi039.stdout:ERROR: (2) No such file or directory
2025-11-05T05:18:38.303 INFO:tasks.workunit.client.0.smithi039.stdout:error setting 'filestore_merge_threshold' to '-1': (2) No such file or directory
2025-11-05T05:18:38.314 INFO:tasks.workunit.client.0.smithi039.stderr:/home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:2687: test_osd_negative_filestore_merge_threshold:  expect_config_value osd.0 filestore_merge_threshold -1
2025-11-05T05:18:38.314 INFO:tasks.workunit.client.0.smithi039.stderr:/home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:141: expect_config_value:  local target config_opt expected_val val
2025-11-05T05:18:38.314 INFO:tasks.workunit.client.0.smithi039.stderr:/home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:142: expect_config_value:  target=osd.0
2025-11-05T05:18:38.314 INFO:tasks.workunit.client.0.smithi039.stderr:/home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:143: expect_config_value:  config_opt=filestore_merge_threshold
2025-11-05T05:18:38.314 INFO:tasks.workunit.client.0.smithi039.stderr:/home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:144: expect_config_value:  expected_val=-1
2025-11-05T05:18:38.314 INFO:tasks.workunit.client.0.smithi039.stderr://home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:146: expect_config_value:  get_config_value_or_die osd.0 filestore_merge_threshold
2025-11-05T05:18:38.314 INFO:tasks.workunit.client.0.smithi039.stderr://home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:121: get_config_value_or_die:  local target config_opt raw val
2025-11-05T05:18:38.315 INFO:tasks.workunit.client.0.smithi039.stderr://home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:123: get_config_value_or_die:  target=osd.0
2025-11-05T05:18:38.315 INFO:tasks.workunit.client.0.smithi039.stderr://home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:124: get_config_value_or_die:  config_opt=filestore_merge_threshold
2025-11-05T05:18:38.315 INFO:tasks.workunit.client.0.smithi039.stderr:///home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:126: get_config_value_or_die:  sudo ceph daemon osd.0 config get filestore_merge_threshold
2025-11-05T05:18:38.436 INFO:tasks.workunit.client.0.smithi039.stderr://home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:126: get_config_value_or_die:  raw='ERROR: (2) No such file or directory
2025-11-05T05:18:38.437 INFO:tasks.workunit.client.0.smithi039.stderr:error getting '\''filestore_merge_threshold'\'': (2) No such file or directory'
2025-11-05T05:18:38.437 INFO:tasks.workunit.client.0.smithi039.stderr://home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:127: get_config_value_or_die:  [[ 0 -ne 0 ]]
2025-11-05T05:18:38.437 INFO:tasks.workunit.client.0.smithi039.stderr:///home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:132: get_config_value_or_die:  echo ERROR: '(2)' No such file or directory error getting ''\''filestore_merge_threshold'\'':' '(2)' No such file or directory
2025-11-05T05:18:38.437 INFO:tasks.workunit.client.0.smithi039.stderr:///home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:132: get_config_value_or_die:  sed -e 's/[{} "]//g'
2025-11-05T05:18:38.437 INFO:tasks.workunit.client.0.smithi039.stderr://home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:132: get_config_value_or_die:  raw='ERROR:(2)Nosuchfileordirectoryerrorgetting'\''filestore_merge_threshold'\'':(2)Nosuchfileordirectory'
2025-11-05T05:18:38.438 INFO:tasks.workunit.client.0.smithi039.stderr:///home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:133: get_config_value_or_die:  echo 'ERROR:(2)Nosuchfileordirectoryerrorgetting'\''filestore_merge_threshold'\'':(2)Nosuchfileordirectory'
2025-11-05T05:18:38.438 INFO:tasks.workunit.client.0.smithi039.stderr:///home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:133: get_config_value_or_die:  cut -f2 -d:
2025-11-05T05:18:38.439 INFO:tasks.workunit.client.0.smithi039.stderr://home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:133: get_config_value_or_die:  val='(2)Nosuchfileordirectoryerrorgetting'\''filestore_merge_threshold'\'''
2025-11-05T05:18:38.439 INFO:tasks.workunit.client.0.smithi039.stderr://home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:135: get_config_value_or_die:  echo '(2)Nosuchfileordirectoryerrorgetting'\''filestore_merge_threshold'\'''
2025-11-05T05:18:38.440 INFO:tasks.workunit.client.0.smithi039.stderr://home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:136: get_config_value_or_die:  return 0
2025-11-05T05:18:38.440 INFO:tasks.workunit.client.0.smithi039.stderr:/home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:146: expect_config_value:  val='(2)Nosuchfileordirectoryerrorgetting'\''filestore_merge_threshold'\'''
2025-11-05T05:18:38.440 INFO:tasks.workunit.client.0.smithi039.stderr:/home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:148: expect_config_value:  [[ (2)Nosuchfileordirectoryerrorgetting'filestore_merge_threshold' != \-\1 ]]
2025-11-05T05:18:38.440 INFO:tasks.workunit.client.0.smithi039.stderr:/home/ubuntu/cephtest/clone.client.0/qa/workunits/cephtool/test.sh:149: expect_config_value:  echo 'expected '\''-1'\'', got '\''(2)Nosuchfileordirectoryerrorgetting'\''filestore_merge_threshold'\'''\'''
2025-11-05T05:18:38.440 INFO:tasks.workunit.client.0.smithi039.stdout:expected '-1', got '(2)Nosuchfileordirectoryerrorgetting'filestore_merge_threshold''
2025-11-05T05:18:38.758 ERROR:teuthology.run_tasks:Saw exception from tasks.

Also, during the QA Analysis I raised this: https://tracker.ceph.com/issues/73915
Not sure if this second issue is related as it is bluestore rather than filestore, so the connection is tenuous but wanted to bring it up just to be sure.

@ljflores
Copy link
Member

Please re-add the "needs-qa" label once the above comment has been addressed.

@github-actions
Copy link

This pull request has been automatically marked as stale because it has not had any activity for 60 days. It will be closed if no further activity occurs for another 30 days.
If you are a maintainer or core committer, please follow-up on this pull request to identify what steps should be taken by the author to move this proposed change forward.
If you are the author of this pull request, thank you for your proposed contribution. If you believe this change is still appropriate, please ensure that any feedback has been addressed and ask for a code review.

@github-actions github-actions bot added the stale label Jan 21, 2026
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
@rzarzynski
Copy link
Contributor Author

@ljflores: knocked out the FileStore leftovers in qa (from the rados suite).

@amathuria
Copy link
Contributor

@amathuria
Copy link
Contributor

jenkins retest this please

1 similar comment
@SrinivasaBharath
Copy link
Contributor

jenkins retest this please

@SrinivasaBharath
Copy link
Contributor

SrinivasaBharath commented Feb 23, 2026

@rzarzynski - Kindly resolve the failed checks and proceed with merging the pull request once all issues have been fixed. If a retest is required, please add the "needs-qa" label

@rzarzynski
Copy link
Contributor Author

jenkins test make check arm64

@rzarzynski
Copy link
Contributor Author

jenkins test make check

@rzarzynski
Copy link
Contributor Author

The following tests FAILED:
	302 - run-tox-qa (Failed)

@rzarzynski
Copy link
Contributor Author

jenkins test make check

@rzarzynski
Copy link
Contributor Author

jenkins test make check arm64

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants