my $STATE = "${CONFIG_PATH}sync_state";
my $CRONJOBS = "/etc/cron.d/$PROGNAME";
my $PATH = "/usr/sbin/";
-my $QEMU_CONF = "/etc/pve/local/qemu-server/";
+my $PVE_DIR = "/etc/pve/local/";
+my $QEMU_CONF = "${PVE_DIR}qemu-server/";
+my $LXC_CONF = "${PVE_DIR}lxc/";
my $LOCKFILE = "$CONFIG_PATH${PROGNAME}.lock";
my $PROG_PATH = "$PATH${PROGNAME}";
my $INTERVAL = 15;
sub check_pool_exists {
my ($target) = @_;
- my $cmd = '';
- $cmd = "ssh root\@$target->{ip} " if $target->{ip};
- $cmd .= "zfs list $target->{all} -H";
+ my $cmd = [];
+ push @$cmd, 'ssh', "root\@$target->{ip}", '--', if $target->{ip};
+ push @$cmd, 'zfs', 'list', '-H', '--', $target->{all};
eval {
run_cmd($cmd);
};
$job->{state} = $state->{state};
$job->{lsync} = $state->{lsync};
+ $job->{vm_type} = $state->{vm_type};
for (my $i = 0; $state->{"snap$i"}; $i++) {
$job->{"snap$i"} = $state->{"snap$i"};
if ($job->{state} ne "del") {
$state->{state} = $job->{state};
$state->{lsync} = $job->{lsync};
+ $state->{vm_type} = $job->{vm_type};
for (my $i = 0; $job->{"snap$i"} ; $i++) {
$state->{"snap$i"} = $job->{"snap$i"};
my $cfg = read_cron();
- my $list = sprintf("%-25s%-15s%-7s%-20s%-5s\n" , "SOURCE", "NAME", "STATE", "LAST SYNC", "TYPE");
+ my $list = sprintf("%-25s%-10s%-7s%-20s%-5s%-5s\n" , "SOURCE", "NAME", "STATE", "LAST SYNC", "TYPE", "CON");
my $states = read_state();
foreach my $source (sort keys%{$cfg}) {
foreach my $name (sort keys%{$cfg->{$source}}) {
$list .= sprintf("%-25s", cut_target_width($source, 25));
- $list .= sprintf("%-15s", cut_target_width($name, 15));
+ $list .= sprintf("%-10s", cut_target_width($name, 10));
$list .= sprintf("%-7s", $states->{$source}->{$name}->{state});
$list .= sprintf("%-20s",$states->{$source}->{$name}->{lsync});
+ $list .= sprintf("%-5s",$states->{$source}->{$name}->{vm_type});
$list .= sprintf("%-5s\n",$cfg->{$source}->{$name}->{method});
}
}
sub vm_exists {
my ($target) = @_;
+
+ my @cmd = ('ssh', "root\@$target->{ip}", '--') if $target->{ip};
- my $cmd = "";
- $cmd = "ssh root\@$target->{ip} " if ($target->{ip});
- $cmd .= "qm status $target->{vmid}";
+ my $res = undef;
- my $res = run_cmd($cmd);
+ eval { $res = run_cmd([@cmd, 'ls', "$QEMU_CONF$target->{vmid}.conf"]) };
+
+ return "qemu" if $res;
+
+ eval { $res = run_cmd([@cmd, 'ls', "$LXC_CONF$target->{vmid}.conf"]) };
+
+ return "lxc" if $res;
- return 1 if ($res =~ m/^status.*$/);
return undef;
}
my $dest = parse_target($param->{dest});
if (my $ip = $dest->{ip}) {
- run_cmd("ssh-copy-id -i /root/.ssh/id_rsa.pub root\@$ip");
+ run_cmd(['ssh-copy-id', '-i', '/root/.ssh/id_rsa.pub', "root\@$ip"]);
}
if (my $ip = $source->{ip}) {
- run_cmd("ssh-copy-id -i /root/.ssh/id_rsa.pub root\@$ip");
+ run_cmd(['ssh-copy-id', '-i', '/root/.ssh/id_rsa.pub', "root\@$ip"]);
}
die "Pool $dest->{all} does not exists\n" if check_pool_exists($dest);
die "Pool $source->{path} does not exists\n" if undef($check);
- die "VM $source->{vmid} doesn't exist\n" if $param->{vmid} && !vm_exists($source);
+ my $vm_type = vm_exists($source);
+ $job->{vm_type} = $vm_type;
+
+ die "VM $source->{vmid} doesn't exist\n" if $param->{vmid} && !$vm_type;
die "Config already exists\n" if $cfg->{$job->{source}}->{$job->{name}};
};
+ my $vm_type = vm_exists($source);
+ $source->{vm_type} = $vm_type;
+
if ($job) {
$job->{state} = "syncing";
+ $job->{vm_type} = $vm_type if !$job->{vm_type};
update_state($job);
}
eval{
if ($source->{vmid}) {
- die "VM $source->{vmid} doesn't exist\n" if !vm_exists($source);
+ die "VM $source->{vmid} doesn't exist\n" if !$vm_type;
my $disks = get_disks($source);
foreach my $disk (sort keys %{$disks}) {
sub snapshot_get{
my ($source, $dest, $max_snap, $name) = @_;
- my $cmd = "zfs list -r -t snapshot -Ho name, -S creation ";
-
- $cmd .= $source->{all};
- $cmd = "ssh root\@$source->{ip} ".$cmd if $source->{ip};
+ my $cmd = [];
+ push @$cmd, 'ssh', "root\@$source->{ip}", '--', if $source->{ip};
+ push @$cmd, 'zfs', 'list', '-r', '-t', 'snapshot', '-Ho', 'name', '-S', 'creation';
+ push @$cmd, $source->{all};
my $raw = run_cmd($cmd);
my $index = 0;
my $path = "$source->{all}\@$snap_name";
- my $cmd = "zfs snapshot $path";
- $cmd = "ssh root\@$source->{ip} $cmd" if $source->{ip};
-
+ my $cmd = [];
+ push @$cmd, 'ssh', "root\@$source->{ip}", '--', if $source->{ip};
+ push @$cmd, 'zfs', 'snapshot', $path;
eval{
run_cmd($cmd);
};
sub get_disks {
my ($target) = @_;
- my $cmd = "";
- $cmd = "ssh root\@$target->{ip} " if $target->{ip};
- $cmd .= "qm config $target->{vmid}";
+ my $cmd = [];
+ push @$cmd, 'ssh', "root\@$target->{ip}", '--', if $target->{ip};
+
+ if ($target->{vm_type} eq 'qemu') {
+ push @$cmd, 'qm', 'config', $target->{vmid};
+ } elsif ($target->{vm_type} eq 'lxc') {
+ push @$cmd, 'pct', 'config', $target->{vmid};
+ } else {
+ die "VM Type unknown\n";
+ }
my $res = run_cmd($cmd);
- my $disks = parse_disks($res, $target->{ip});
+ my $disks = parse_disks($res, $target->{ip}, $target->{vm_type});
return $disks;
}
my $line = $1;
next if $line =~ /cdrom|none/;
- next if $line !~ m/^(?:virtio|ide|scsi|sata)\d+: /;
+ next if $line !~ m/^(?:((?:virtio|ide|scsi|sata|mp)\d+)|rootfs): /;
my $disk = undef;
my $stor = undef;
- if($line =~ m/^(?:virtio|ide|scsi|sata)\d+: (.+:)([A-Za-z0-9\-]+),(.*)$/) {
- $disk = $2;
- $stor = $1;
+ if($line =~ m/^(?:((?:virtio|ide|scsi|sata|mp)\d+)|rootfs): (.+:)([A-Za-z0-9\-]+),(.*)$/) {
+ $disk = $3;
+ $stor = $2;
} else {
die "disk is not on ZFS Storage\n";
}
- my $cmd = "";
- $cmd .= "ssh root\@$ip " if $ip;
- $cmd .= "pvesm path $stor$disk";
+ my $cmd = [];
+ push @$cmd, 'ssh', "root\@$ip", '--' if $ip;
+ push @$cmd, 'pvesm', 'path', "$stor$disk";
my $path = run_cmd($cmd);
- if ($path =~ m/^\/dev\/zvol\/(\w+.*)(\/$disk)$/) {
+ if ($vm_type eq 'qemu' && $path =~ m/^\/dev\/zvol\/(\w+.*)(\/$disk)$/) {
my @array = split('/', $1);
$disks->{$num}->{pool} = shift(@array);
$disks->{$num}->{last_part} = $disk;
$disks->{$num}->{all} .= "\/$disk";
+ $num++;
+ } elsif ($vm_type eq 'lxc' && $path =~ m/^\/(\w+.+)\/(\w+.*)(\/$disk)$/) {
+
+ $disks->{$num}->{pool} = $1;
+ $disks->{$num}->{all} = $disks->{$num}->{pool};
+
+ if ($2) {
+ $disks->{$num}->{path} = $2;
+ $disks->{$num}->{all} .= "\/$disks->{$num}->{path}";
+ }
+
+ $disks->{$num}->{last_part} = $disk;
+ $disks->{$num}->{all} .= "\/$disk";
+
$num++;
} else {
sub snapshot_destroy {
my ($source, $dest, $method, $snap) = @_;
- my $zfscmd = "zfs destroy ";
+ my @zfscmd = ('zfs', 'destroy');
my $snapshot = "$source->{all}\@$snap";
eval {
if($source->{ip} && $method eq 'ssh'){
- run_cmd("ssh root\@$source->{ip} $zfscmd $snapshot");
+ run_cmd(['ssh', "root\@$source->{ip}", '--', @zfscmd, $snapshot]);
} else {
- run_cmd("$zfscmd $snapshot");
+ run_cmd([@zfscmd, $snapshot]);
}
};
if (my $erro = $@) {
warn "WARN: $erro";
}
if ($dest) {
- my $ssh = $dest->{ip} ? "ssh root\@$dest->{ip}" : "";
+ my @ssh = $dest->{ip} ? ('ssh', "root\@$dest->{ip}", '--') : ();
my $path = "$dest->{all}\/$source->{last_part}";
eval {
- run_cmd("$ssh $zfscmd $path\@$snap ");
+ run_cmd([@ssh, @zfscmd, "$path\@$snap"]);
};
if (my $erro = $@) {
warn "WARN: $erro";
sub snapshot_exist {
my ($source ,$dest, $method) = @_;
- my $cmd = "";
- $cmd = "ssh root\@$dest->{ip} " if $dest->{ip};
- $cmd .= "zfs list -rt snapshot -Ho name $dest->{all}";
- $cmd .= "\/$source->{last_part}\@$source->{old_snap}";
+ my $cmd = [];
+ push @$cmd, 'ssh', "root\@$dest->{ip}", '--' if $dest->{ip};
+ push @$cmd, 'zfs', 'list', '-rt', 'snapshot', '-Ho', 'name';
+ push @$cmd, "$dest->{all}/$source->{last_part}\@$source->{old_snap}";
my $text = "";
eval {$text =run_cmd($cmd);};
sub send_image {
my ($source, $dest, $param) = @_;
- my $cmd = "";
+ my $cmd = [];
- $cmd .= "ssh root\@$source->{ip} " if $source->{ip};
- $cmd .= "zfs send ";
- $cmd .= "-v " if $param->{verbose};
+ push @$cmd, 'ssh', "root\@$source->{ip}", '--' if $source->{ip};
+ push @$cmd, 'zfs', 'send';
+ push @$cmd, '-v' if $param->{verbose};
if($source->{last_snap} && snapshot_exist($source ,$dest, $param->{method})) {
- $cmd .= "-i $source->{all}\@$source->{last_snap} $source->{all}\@$source->{new_snap} ";
- } else {
- $cmd .= "$source->{all}\@$source->{new_snap} ";
+ push @$cmd, '-i', "$source->{all}\@$source->{last_snap}";
}
+ push @$cmd, '--', "$source->{all}\@$source->{new_snap}";
if ($param->{limit}){
my $bwl = $param->{limit}*1024;
- $cmd .= "| cstream -t $bwl";
+ push @$cmd, \'|', 'cstream', '-t', $bwl;
}
- $cmd .= "| ";
- $cmd .= "ssh root\@$dest->{ip} " if $dest->{ip};
- $cmd .= "zfs recv $dest->{all}";
- $cmd .= "\/$source->{last_part}\@$source->{new_snap}";
+ my $target = "$dest->{all}/$source->{last_part}";
+ $target =~ s!/+!/!g;
+
+ push @$cmd, \'|';
+ push @$cmd, 'ssh', "root\@$dest->{ip}", '--' if $dest->{ip};
+ push @$cmd, 'zfs', 'recv', '-F', '--';
+ push @$cmd, "$target";
eval {
run_cmd($cmd)
sub send_config{
my ($source, $dest, $method) = @_;
- my $source_target ="$QEMU_CONF$source->{vmid}.conf";
+ my $source_target = $source->{vm_type} eq 'qemu' ? "$QEMU_CONF$source->{vmid}.conf": "$LXC_CONF$source->{vmid}.conf";
my $dest_target_new ="$CONFIG_PATH$source->{vmid}.conf.$source->{new_snap}";
if ($method eq 'ssh'){
if ($dest->{ip} && $source->{ip}) {
- run_cmd("ssh root\@$dest->{ip} mkdir $CONFIG_PATH -p");
- run_cmd("scp root\@$source->{ip}:$source_target root\@$dest->{ip}:$dest_target_new");
+ run_cmd(['ssh', "root\@$dest->{ip}", '--', 'mkdir', '-p', '--', $CONFIG_PATH]);
+ run_cmd(['scp', '--', "root\@[$source->{ip}]:$source_target", "root\@[$dest->{ip}]:$dest_target_new"]);
} elsif ($dest->{ip}) {
- run_cmd("ssh root\@$dest->{ip} mkdir $CONFIG_PATH -p");
- run_cmd("scp $source_target root\@$dest->{ip}:$dest_target_new");
+ run_cmd(['ssh', "root\@$dest->{ip}", '--', 'mkdir', '-p', '--', $CONFIG_PATH]);
+ run_cmd(['scp', '--', $source_target, "root\@[$dest->{ip}]:$dest_target_new"]);
} elsif ($source->{ip}) {
- run_cmd("mkdir $CONFIG_PATH -p");
- run_cmd("scp root\@$source->{ip}:$source_target $dest_target_new");
+ run_cmd(['mkdir', '-p', '--', $CONFIG_PATH]);
+ run_cmd(['scp', '--', "root\@$source->{ip}:$source_target", $dest_target_new]);
}
if ($source->{destroy}){
my $dest_target_old ="$CONFIG_PATH$source->{vmid}.conf.$source->{old_snap}";
if($dest->{ip}){
- run_cmd("ssh root\@$dest->{ip} rm -f $dest_target_old");
+ run_cmd(['ssh', "root\@$dest->{ip}", '--', 'rm', '-f', '--', $dest_target_old]);
} else {
- run_cmd("rm -f $dest_target_old");
+ run_cmd(['rm', '-f', '--', $dest_target_old]);
}
}
}
projects / pve-zsync.git / blobdiff