Skip to content

use cephadm shell so not the whole ceph stack is needed #1859

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.

Sign up for GitHub

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

Draft
kwaegema wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

use cephadm shell so not the whole ceph stack is needed #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1388451
no ceph
kwaegema Mar 4, 2026
d9f5783
use cephadm
kwaegema Mar 4, 2026
2246be7
fix tests for cephadm
kwaegema Mar 4, 2026
f7d7e83
cephadm has debug on stderr output
kwaegema Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ncm-ceph/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<artifactId>rpm-maven-plugin</artifactId>
<configuration>
<requires>
<require>ceph</require>
<require>cephadm</require>
</requires>
<mappings combine.children="append">
<mapping>
Expand Down
3 changes: 2 additions & 1 deletion ncm-ceph/src/main/perl/Ceph/Commands.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ sub run_command_as_ceph
sub run_ceph_command
{
my ($self, $command, $msg, %opts) = @_;
return $self->run_command([qw(/usr/bin/ceph -f json), @$command], $msg, %opts);
$opts{nostderr} = 1;
return $self->run_command([qw(/usr/sbin/cephadm shell ceph -f json), @$command], $msg, %opts);
}

# run a command prefixed with ceph-deploy and return the output (no json)
Expand Down
2 changes: 1 addition & 1 deletion ncm-ceph/src/test/perl/cfgdb.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ my $cfgdb = NCM::Component::Ceph::CfgDb->new($cl);
isa_ok($cl, 'NCM::Component::Ceph::Cluster', 'got Cluster instance');
isa_ok($cfgdb, 'NCM::Component::Ceph::CfgDb', 'got CfgDb instance');

set_desired_output("/usr/bin/ceph -f json config dump", $cfgdata::CONFJSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json config dump", $cfgdata::CONFJSON);
$cfgdb->parse_profile_cfg();
cmp_deeply($cfgdb->{quattor}, \%cfgdata::PROFILE_CFG, 'profile hash correct');

Expand Down
2 changes: 1 addition & 1 deletion ncm-ceph/src/test/perl/cluster-prepare.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ my $gather1 = "$dpp ceph001.cubone.os";
my $gather2 = "$dpp ceph002.cubone.os";
my $gather3 = "$dpp ceph003.cubone.os";
my @gathers = ($gather1, $gather2, $gather3);
set_desired_output("/usr/bin/ceph -f json --cluster ceph status", $clusterdata::STATE);
set_desired_output("/usr/sbin/cephadm shell ceph -f json --cluster ceph status", $clusterdata::STATE);


# Totally new cluster
Expand Down
6 changes: 3 additions & 3 deletions ncm-ceph/src/test/perl/clustermap-hash.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ my $cl = NCM::Component::Ceph::Cluster->new($cfg, $cmp, $cmp->prefix());
my $clmap = NCM::Component::Ceph::ClusterMap->new($cl);
isa_ok($clmap, 'NCM::Component::Ceph::ClusterMap', 'got ClusterMap instance');

set_desired_output("/usr/bin/ceph -f json mon dump", $clmapdata::MONJSON);
set_desired_output("/usr/bin/ceph -f json mgr dump", $clmapdata::MGRJSON);
set_desired_output("/usr/bin/ceph -f json mds stat", $clmapdata::MDSJSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json mon dump", $clmapdata::MONJSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json mgr dump", $clmapdata::MGRJSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json mds stat", $clmapdata::MDSJSON);

ok($clmap->map_existing(), 'mapping existing daemons');

Expand Down
12 changes: 6 additions & 6 deletions ncm-ceph/src/test/perl/config-deploy.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ my $cmp = NCM::Component::Ceph::Luminous->new('ceph');
my $cl = NCM::Component::Ceph::Cluster->new($cfg, $cmp, $cmp->prefix());
my $cfgdb = NCM::Component::Ceph::CfgDb->new($cl);

set_desired_output("/usr/bin/ceph -f json config dump", $cfgdata::CONFJSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json config dump", $cfgdata::CONFJSON);

my $cfgmap = $cfgdb->get_deploy_config();
cmp_deeply($cfgmap, \%cfgdata::DEPLOY_CFG, 'deploy hash correct');

ok($cl->deploy_config($cfgmap), 'config deployment ok');

ok(get_command('/usr/bin/ceph -f json config set global op_queue wpq'), 'op_queue set');
ok(get_command('/usr/bin/ceph -f json config set global mon_osd_down_out_subtree_limit rack'), 'subtree_limit set');
ok(get_command('/usr/bin/ceph -f json config set mds mds_max_purge_ops_per_pg 10'), 'mds_max_purge_ops_per_pg set');
ok(get_command('/usr/bin/ceph -f json config set mgr mgr/dashboard/server_addr localhost'), 'mgr/dashboard/server_addr set');
ok(get_command('/usr/bin/ceph -f json config set mgr mgr/telemetry/contact me'), 'mgr/telemetry/contact set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set global op_queue wpq'), 'op_queue set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set global mon_osd_down_out_subtree_limit rack'), 'subtree_limit set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set mds mds_max_purge_ops_per_pg 10'), 'mds_max_purge_ops_per_pg set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set mgr mgr/dashboard/server_addr localhost'), 'mgr/dashboard/server_addr set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set mgr mgr/telemetry/contact me'), 'mgr/telemetry/contact set');

done_testing();
12 changes: 6 additions & 6 deletions ncm-ceph/src/test/perl/configure.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ my $cmp = NCM::Component::Ceph::Luminous->new('ceph');
# isa_ok($cmp, 'NCM::Component::ceph', 'got ncm-ceph instance');

set_desired_output($osddata::GET_CEPH_PVS_CMD, $osddata::OSD_PVS_OUT);
set_desired_output("/usr/bin/ceph -f json mon dump", $clmapdata::MONJSON);
set_desired_output("/usr/bin/ceph -f json mgr dump", $clmapdata::MGRJSON);
set_desired_output("/usr/bin/ceph -f json mds stat", $clmapdata::MDSJSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json mon dump", $clmapdata::MONJSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json mgr dump", $clmapdata::MGRJSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json mds stat", $clmapdata::MDSJSON);

set_desired_output("/usr/bin/ceph -f json config dump",'[]');
set_desired_output("/usr/sbin/cephadm shell ceph -f json config dump",'[]');

set_desired_output('/usr/bin/ceph -f json --version', $clusterdata::CEPH_VERSION);
set_desired_output('/usr/bin/ceph -f json osd dump --id bootstrap-osd', $osddata::OSD_DUMP);
set_desired_output('/usr/sbin/cephadm shell ceph -f json --version', $clusterdata::CEPH_VERSION);
set_desired_output('/usr/sbin/cephadm shell ceph -f json osd dump --id bootstrap-osd', $osddata::OSD_DUMP);
set_file_contents($osddata::BOOTSTRAP_OSD_KEYRING, 'key');
set_file_contents($osddata::BOOTSTRAP_OSD_KEYRING_SL, 'key');

Expand Down
12 changes: 6 additions & 6 deletions ncm-ceph/src/test/perl/oct-cfgdb.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ my $cfgdb = NCM::Component::Ceph::CfgDb->new($cl, $cl->{tree}->{configdb});
isa_ok($cl, 'NCM::Component::Ceph::Orchestrator', 'got Orchestrator instance');
isa_ok($cfgdb, 'NCM::Component::Ceph::CfgDb', 'got CfgDb instance');

set_desired_output("/usr/bin/ceph -f json config dump", $cfgdata::CONFJSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json config dump", $cfgdata::CONFJSON);
$cfgdb->parse_profile_cfg();
cmp_deeply($cfgdb->{quattor}, \%cfgdata::PROFILE_CFG, 'profile hash correct');

Expand All @@ -32,9 +32,9 @@ cmp_deeply($cfgmap, \%cfgdata::DEPLOY_CFG, 'deploy hash correct');

ok($cl->deploy_config($cfgmap), 'config deployment ok');

ok(get_command('/usr/bin/ceph -f json config set global op_queue wpq'), 'op_queue set');
ok(get_command('/usr/bin/ceph -f json config set global mon_osd_down_out_subtree_limit rack'), 'subtree_limit set');
ok(get_command('/usr/bin/ceph -f json config set mds mds_max_purge_ops_per_pg 10'), 'mds_max_purge_ops_per_pg set');
ok(get_command('/usr/bin/ceph -f json config set mgr mgr/dashboard/server_addr localhost'), 'mgr/dashboard/server_addr set');
ok(get_command('/usr/bin/ceph -f json config set mgr mgr/telemetry/contact me'), 'mgr/telemetry/contact set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set global op_queue wpq'), 'op_queue set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set global mon_osd_down_out_subtree_limit rack'), 'subtree_limit set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set mds mds_max_purge_ops_per_pg 10'), 'mds_max_purge_ops_per_pg set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set mgr mgr/dashboard/server_addr localhost'), 'mgr/dashboard/server_addr set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set mgr mgr/telemetry/contact me'), 'mgr/telemetry/contact set');
done_testing();
12 changes: 6 additions & 6 deletions ncm-ceph/src/test/perl/oct-config-deploy.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ my $cfg = get_config_for_profile("oct_cluster");
my $cmp = NCM::Component::Ceph::Octopus->new('ceph');
my $cl = NCM::Component::Ceph::Orchestrator->new($cfg, $cmp);

set_desired_output("/usr/bin/ceph -f json config dump", $cfgdata::CONFJSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json config dump", $cfgdata::CONFJSON);

ok($cl->set_config_db(), 'config deployment ok');

ok(get_command('/usr/bin/ceph -f json config set global op_queue wpq'), 'op_queue set');
ok(get_command('/usr/bin/ceph -f json config set global mon_osd_down_out_subtree_limit rack'), 'subtree_limit set');
ok(get_command('/usr/bin/ceph -f json config set mds mds_max_purge_ops_per_pg 10'), 'mds_max_purge_ops_per_pg set');
ok(get_command('/usr/bin/ceph -f json config set mgr mgr/dashboard/server_addr localhost'), 'mgr/dashboard/server_addr set');
ok(get_command('/usr/bin/ceph -f json config set mgr mgr/telemetry/contact me'), 'mgr/telemetry/contact set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set global op_queue wpq'), 'op_queue set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set global mon_osd_down_out_subtree_limit rack'), 'subtree_limit set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set mds mds_max_purge_ops_per_pg 10'), 'mds_max_purge_ops_per_pg set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set mgr mgr/dashboard/server_addr localhost'), 'mgr/dashboard/server_addr set');
ok(get_command('/usr/sbin/cephadm shell ceph -f json config set mgr mgr/telemetry/contact me'), 'mgr/telemetry/contact set');

done_testing();
6 changes: 3 additions & 3 deletions ncm-ceph/src/test/perl/oct-configure.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ my $cmp = NCM::Component::Ceph::Octopus->new('ceph');
isa_ok($cmp, 'NCM::Component::Ceph::Octopus', 'got ncm-ceph instance');


set_desired_output('/usr/bin/ceph -f json --version', $clusterdata::CEPH_VERSION_OCT);
set_desired_output('/usr/bin/ceph -f json orch host ls', $orchdata::HOSTS_JSON);
set_desired_output("/usr/bin/ceph -f json config dump",'[]');
set_desired_output('/usr/sbin/cephadm shell ceph -f json --version', $clusterdata::CEPH_VERSION_OCT);
set_desired_output('/usr/sbin/cephadm shell ceph -f json orch host ls', $orchdata::HOSTS_JSON);
set_desired_output("/usr/sbin/cephadm shell ceph -f json config dump",'[]');

ok($cmp->Configure($cfg), 'Ceph component configure ok');

Expand Down
2 changes: 1 addition & 1 deletion ncm-ceph/src/test/perl/octdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@



set_desired_output('/usr/bin/ceph -f json --version', $clusterdata::CEPH_VERSION);
set_desired_output('/usr/sbin/cephadm shell ceph -f json --version', $clusterdata::CEPH_VERSION);
6 changes: 3 additions & 3 deletions ncm-ceph/src/test/perl/orch-apply.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ isa_ok($cl, 'NCM::Component::Ceph::Orchestrator', 'got Orchestrator instance');
ok($cl->deploy_orch_section("mon"), 'deployed orch section mon ok');
my $fh = get_file('/etc/ceph/orch_mon.yaml');
is("$fh", $orchdata::MON_YAML, 'mon yaml cfgfile ok');
ok(get_command('/usr/bin/ceph -f json orch apply -i /etc/ceph/orch_mon.yaml'), 'applied mon config');
ok(get_command('/usr/sbin/cephadm shell ceph -f json orch apply -i /etc/ceph/orch_mon.yaml'), 'applied mon config');

ok($cl->deploy_orch_section("mgr"), 'deployed orch section mgr ok');
$fh = get_file('/etc/ceph/orch_mgr.yaml');
Expand All @@ -30,11 +30,11 @@ is("$fh", $orchdata::MDS_YAML, 'mds yaml cfgfile ok');
ok($cl->deploy_orch_section("osd"), 'deployed orch section osd ok');
$fh = get_file('/etc/ceph/orch_osd.yaml');
is("$fh", $orchdata::OSD_YAML, 'osd yaml cfgfile ok');
ok(get_command('/usr/bin/ceph -f json orch apply -i /etc/ceph/orch_osd.yaml'), 'applied osd config');
ok(get_command('/usr/sbin/cephadm shell ceph -f json orch apply -i /etc/ceph/orch_osd.yaml'), 'applied osd config');

ok($cl->deploy_orch_section("hosts"), 'deployed orch section hosts ok');
$fh = get_file('/etc/ceph/orch_hosts.yaml');
is("$fh", $orchdata::HOSTS_YAML, 'hosts yaml cfgfile ok');
ok(get_command('/usr/bin/ceph -f json orch apply -i /etc/ceph/orch_hosts.yaml'), 'applied hosts config');
ok(get_command('/usr/sbin/cephadm shell ceph -f json orch apply -i /etc/ceph/orch_hosts.yaml'), 'applied hosts config');

done_testing();
2 changes: 1 addition & 1 deletion ncm-ceph/src/test/perl/osddata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use Readonly;
Readonly our $BOOTSTRAP_OSD_KEYRING => '/var/lib/ceph/bootstrap-osd/ceph.keyring';
Readonly our $BOOTSTRAP_OSD_KEYRING_SL => '/etc/ceph/ceph.client.bootstrap-osd.keyring';
Readonly our $GET_CEPH_PVS_CMD => 'pvs -o pv_name,lv_tags --no-headings --reportformat json';
Readonly our $CRUSH => '/usr/bin/ceph -f json osd crush';
Readonly our $CRUSH => '/usr/sbin/cephadm shell ceph -f json osd crush';

Readonly our $OSD_PVS_OUT => <<EOD;
{
Expand Down
2 changes: 1 addition & 1 deletion ncm-ceph/src/test/perl/osdserver-crush.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ my $cl = NCM::Component::Ceph::OSDserver->new($cfg, $obj, $cmp->prefix());
isa_ok($cl, 'NCM::Component::Ceph::OSDserver', 'got OSDserver instance');

set_desired_output($osddata::GET_CEPH_PVS_CMD, $osddata::OSD_PVS_OUT);
set_desired_output('/usr/bin/ceph -f json osd dump --id bootstrap-osd', $osddata::OSD_DUMP);
set_desired_output('/usr/sbin/cephadm shell ceph -f json osd dump --id bootstrap-osd', $osddata::OSD_DUMP);

set_command_status("$osddata::CRUSH set-device-class special osd.24 --name osd.24", 1);

Expand Down
4 changes: 2 additions & 2 deletions ncm-ceph/src/test/perl/osdserver-deploy.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ ok(!$cl->is_node_healthy(), 'node not healthy');
set_file_contents($osddata::BOOTSTRAP_OSD_KEYRING, 'key');
set_file_contents($osddata::BOOTSTRAP_OSD_KEYRING_SL, 'key');
ok($cl->is_node_healthy(), 'node healthy');
ok(get_command('/usr/bin/ceph -f json status --id bootstrap-osd'), 'ran cluster health command');
ok(get_command('/usr/sbin/cephadm shell ceph -f json status --id bootstrap-osd'), 'ran cluster health command');

set_desired_output($osddata::GET_CEPH_PVS_CMD, $osddata::OSD_PVS_OUT);
set_desired_output('/usr/bin/ceph -f json osd dump --id bootstrap-osd', $osddata::OSD_DUMP);
set_desired_output('/usr/sbin/cephadm shell ceph -f json osd dump --id bootstrap-osd', $osddata::OSD_DUMP);
cmp_deeply($cl->get_deployed_osds(), \%osddata::OSD_DEPLOYED, 'Deployed OSD fetched');
#diag explain $cl->get_deployed_osds();

Expand Down
Loading