ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: renamed variables: use $url and $path instead of $vol

pull/30/head
Axel Burri 2015-04-14 02:40:25 +02:00
parent 3ebb816290
commit e7e28c2418
1 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
btrbk
View File

@ -207,7 +207,7 @@ sub get_rsh($$)
my $url = shift // die; my $url = shift // die;
my $config = shift; my $config = shift;
if($config && ($url =~ /^ssh:\/\/(\S+?)(\/\S+)$/)) { if($config && ($url =~ /^ssh:\/\/(\S+?)(\/\S+)$/)) {
my ($ssh_host, $file) = ($1, $2); my ($ssh_host, $path) = ($1, $2);
my $ssh_user = config_key($config, "ssh_user"); my $ssh_user = config_key($config, "ssh_user");
my $ssh_identity = config_key($config, "ssh_identity"); my $ssh_identity = config_key($config, "ssh_identity");
my $ssh_options = ""; my $ssh_options = "";
@ -218,7 +218,7 @@ sub get_rsh($$)
WARN "No SSH identity provided (option ssh_identity is not set) for: $url"; WARN "No SSH identity provided (option ssh_identity is not set) for: $url";
} }
my $rsh = "/usr/bin/ssh $ssh_options " . $ssh_user . '@' . $ssh_host; my $rsh = "/usr/bin/ssh $ssh_options " . $ssh_user . '@' . $ssh_host;
return ($rsh, $file); return ($rsh, $path);
} }
return ("", $url); return ("", $url);
} }
@ -468,64 +468,63 @@ sub btr_filesystem_show_all_local()
sub btr_filesystem_show($;$) sub btr_filesystem_show($;$)
{ {
my $vol = shift || die; my $url = shift || die;
my $config = shift; my $config = shift;
my ($rsh, $real_vol) = get_rsh($vol, $config); my ($rsh, $path) = get_rsh($url, $config);
my $ret = run_cmd("$rsh /sbin/btrfs filesystem show $real_vol", 1); my $ret = run_cmd("$rsh /sbin/btrfs filesystem show $path", 1);
return $ret; return $ret;
} }
sub btr_filesystem_df($;$) sub btr_filesystem_df($;$)
{ {
my $vol = shift || die; my $url = shift || die;
my $config = shift; my $config = shift;
my ($rsh, $real_vol) = get_rsh($vol, $config); my ($rsh, $path) = get_rsh($url, $config);
my $ret = run_cmd("$rsh /sbin/btrfs filesystem df $real_vol", 1); my $ret = run_cmd("$rsh /sbin/btrfs filesystem df $path", 1);
return $ret; return $ret;
} }
sub btr_filesystem_usage($;$) sub btr_filesystem_usage($;$)
{ {
my $vol = shift || die; my $url = shift || die;
my $config = shift; my $config = shift;
my ($rsh, $real_vol) = get_rsh($vol, $config); my ($rsh, $path) = get_rsh($url, $config);
my $ret = run_cmd("$rsh /sbin/btrfs filesystem usage $real_vol", 1); my $ret = run_cmd("$rsh /sbin/btrfs filesystem usage $path", 1);
return $ret; return $ret;
} }
sub btr_subvolume_detail($;$) sub btr_subvolume_detail($;$)
{ {
my $vol = shift || die; my $url = shift || die;
my $config = shift; my $config = shift;
my ($rsh, $real_vol) = get_rsh($vol, $config); my ($rsh, $path) = get_rsh($url, $config);
my $ret = run_cmd("$rsh /sbin/btrfs subvolume show $real_vol 2>/dev/null", 1); my $ret = run_cmd("$rsh /sbin/btrfs subvolume show $path 2>/dev/null", 1);
if($ret) if($ret)
{ {
my $fs_path; my $fs_path;
if($ret =~ /^($file_match)/) { if($ret =~ /^($file_match)/) {
$fs_path = $1; $fs_path = $1;
DEBUG "Real path for subvolume \"$vol\" is: $fs_path" if($fs_path ne $real_vol); DEBUG "Real path for subvolume \"$url\" is: $fs_path" if($fs_path ne $path);
return undef unless(check_file($fs_path, { absolute => 1 })); return undef unless(check_file($fs_path, { absolute => 1 }));
} }
else { else {
$fs_path = $real_vol; $fs_path = $path;
WARN "No real path provided by \"btrfs subvolume show\" for subvolume \"$vol\", using: $real_vol"; WARN "No real path provided by \"btrfs subvolume show\" for subvolume \"$url\", using: $path";
} }
my %detail = ( FS_PATH => $fs_path, my %detail = ( FS_PATH => $fs_path,
RSH => $rsh, # !!! TODO: use this everywhere URL => $url,
# FS_PATH_ORIGINAL => $real_vol,
); );
if($ret eq "$fs_path is btrfs root") { if($ret eq "$fs_path is btrfs root") {
DEBUG "found btrfs root: $vol"; DEBUG "found btrfs root: $url";
$detail{id} = 5; $detail{id} = 5;
$detail{is_root} = 1; $detail{is_root} = 1;
} }
elsif($ret =~ /^$fs_path/) { elsif($ret =~ /^$fs_path/) {
TRACE "btr_detail: found btrfs subvolume: $vol"; TRACE "btr_detail: found btrfs subvolume: $url";
my %trans = ( my %trans = (
name => "Name", name => "Name",
uuid => "uuid", uuid => "uuid",
@ -545,19 +544,19 @@ sub btr_subvolume_detail($;$)
WARN "Failed to parse subvolume detail \"$trans{$_}\": $ret"; WARN "Failed to parse subvolume detail \"$trans{$_}\": $ret";
} }
} }
DEBUG "parsed " . scalar(keys %detail) . " subvolume detail items: $vol"; DEBUG "parsed " . scalar(keys %detail) . " subvolume detail items: $url";
TRACE "btr_detail for $vol: " . Dumper \%detail; TRACE "btr_detail for $url: " . Dumper \%detail;
} }
return \%detail; return \%detail;
} }
WARN "Failed to fetch subvolume detail for: $vol"; WARN "Failed to fetch subvolume detail for: $url";
return undef; return undef;
} }
sub btr_subvolume_list($;$@) sub btr_subvolume_list($;$@)
{ {
my $vol = shift || die; my $url = shift || die;
my $config = shift; my $config = shift;
my %opts = @_; my %opts = @_;
my $btrfs_progs_compat = config_key($config, "btrfs_progs_compat"); my $btrfs_progs_compat = config_key($config, "btrfs_progs_compat");
@ -565,10 +564,10 @@ sub btr_subvolume_list($;$@)
$filter_option = "-o" if($opts{subvol_only}); $filter_option = "-o" if($opts{subvol_only});
my $display_options = "-c -u -q"; my $display_options = "-c -u -q";
$display_options .= " -R" unless($btrfs_progs_compat); $display_options .= " -R" unless($btrfs_progs_compat);
my ($rsh, $real_vol) = get_rsh($vol, $config); my ($rsh, $real_vol) = get_rsh($url, $config);
my $ret = run_cmd("$rsh /sbin/btrfs subvolume list $filter_option $display_options $real_vol", 1); my $ret = run_cmd("$rsh /sbin/btrfs subvolume list $filter_option $display_options $real_vol", 1);
unless(defined($ret)) { unless(defined($ret)) {
WARN "Failed to fetch btrfs subvolume list for: $vol"; WARN "Failed to fetch btrfs subvolume list for: $url";
return undef; return undef;
} }
my @nodes; my @nodes;
@ -618,20 +617,20 @@ sub btr_subvolume_list($;$@)
push @nodes, \%node; push @nodes, \%node;
# $node{parent_uuid} = undef if($node{parent_uuid} eq '-'); # $node{parent_uuid} = undef if($node{parent_uuid} eq '-');
} }
DEBUG "parsed " . scalar(@nodes) . " total subvolumes for filesystem at: $vol"; DEBUG "parsed " . scalar(@nodes) . " total subvolumes for filesystem at: $url";
return \@nodes; return \@nodes;
} }
sub btr_subvolume_find_new($$;$) sub btr_subvolume_find_new($$;$)
{ {
my $vol = shift || die; my $url = shift || die;
my $lastgen = shift // die; my $lastgen = shift // die;
my $config = shift; my $config = shift;
my ($rsh, $real_vol) = get_rsh($vol, $config); my ($rsh, $real_vol) = get_rsh($url, $config);
my $ret = run_cmd("$rsh /sbin/btrfs subvolume find-new $real_vol $lastgen"); my $ret = run_cmd("$rsh /sbin/btrfs subvolume find-new $real_vol $lastgen");
unless(defined($ret)) { unless(defined($ret)) {
ERROR "Failed to fetch modified files for: $vol"; ERROR "Failed to fetch modified files for: $url";
return undef; return undef;
} }
@ -682,14 +681,14 @@ sub btr_subvolume_find_new($$;$)
sub btr_tree($;$) sub btr_tree($;$)
{ {
my $vol = shift || die; my $url = shift || die;
my $config = shift; my $config = shift;
my %tree; my %tree;
my %id; my %id;
my $subvol_list = btr_subvolume_list($vol, $config, subvol_only => 0); my $subvol_list = btr_subvolume_list($url, $config, subvol_only => 0);
return undef unless(ref($subvol_list) eq "ARRAY"); return undef unless(ref($subvol_list) eq "ARRAY");
TRACE "btr_tree: processing subvolume list of: $vol"; TRACE "btr_tree: processing subvolume list of: $url";
foreach my $node (@$subvol_list) foreach my $node (@$subvol_list)
{ {