my %commands =
('device' => {func => "Device", doc => "device <dev>: open another OBD device"},
'create' => {func => "Create", doc => "create: creates a new inode"},
- 'attach' => {func => "Attach", doc => "attach { ext2_obd | snap_obd snapdev snapidx tableno}"}, # | scsi_obd adapter bus tid lun |
+ 'attach' => {func => "Attach", doc => "attach { ext2_obd | snap_obd snapdev snapidx tableno | scsi_obd adapter bus tid lun }" },
'detach' => {func => "Detach", doc => "detach this device"},
'testext2iterator' => {func => "TestExt2Iterator", doc => "test ext2 iterator function"},
- 'snapset' => {func => "SnapSetTable", doc => "snapset tableno file" },
- 'snapprint' => {func => "SnapPrint", doc => "snapprint tableno"},
- 'snapdelete' => {func => "SnapDelete", doc => "snapdelete: delete connected snap obd"},
- 'snaprestore' => {func => "SnapRestore", doc => "snaprestore: restore connected old snap to current"},
+ 'snapset' => {func => "SnapSetTable", doc => "snapset <tableno> <file>: set the table (created with snaptable) as table #tableno" },
+ 'snapprint' => {func => "SnapPrint", doc => "snapprint <tableno>: output the contents of table #tableno to the syslog"},
+ 'snapdelete' => {func => "SnapDelete", doc => "snapdelete: delete connected snap obd objects from disk"},
+ 'snaprestore' => {func => "SnapRestore", doc => "snaprestore : restore connected old snap objects to be current"},
'snaptable' => {func => "SnapShotTable", doc => "snaptable: build a snapshot table (interactive)"},
- 'copy' => {func => "Copy", doc => "copy srcid tgtid"},
- 'migrate' => {func => "Migrate", doc => "migrate srcid tgtid"},
+ 'copy' => {func => "Copy", doc => "copy <srcid> <tgtid>: copy objects"},
+ 'migrate' => {func => "Migrate", doc => "migrate <srcid> <tgtid>: migrate data from one object to another"},
'format' => {func => "Format", doc => "format type adapter bus tid lun size"},
'partition' => {func => "Partition", doc => "partition type adapter bus tid lun partition size"},
'setup' => {func => "Setup", doc => "setup [type]: link this OBD device to the underlying device (default type ext2_obd)"},
if ( ! $type ) {
print "error: missing type\n";
usage:
- print "usage: attach {ext2_obd | snap_obd}\n"; # XXX add scsi_obd later
+ print "usage: attach {ext2_obd | snap_obd | scsi_obd}\n";
return;
}
$data = pack("iii", $snapdev, $snapidx, $tableno);
$datalen = 3 * 4;
} elsif ($type eq "ext2_obd") {
- my $basedev = shift;
- # $basedev = "/dev/loop0" unless $basedev;
-
- if (!defined($::st = stat($basedev))) {
- die "Unable to stat $basedev.\n";
- }
+ 1;
} else {
print "error: unknown attach type $type\n";
goto usage;
}
-# XXX the parameter to snaprestore SHOULD be the snapshot number of the
-# snapshot to be restored, and this routine should handle all of the
-# removal of intervening snapshots and changing the snaptable to have
-# the "restored" snapshot as current and move the previous current.
+# this routine does the whole job
sub SnapRestore {
+ my $restoreto = shift;
+ my $snaptable = shift;
+ my $tableno = shift;
+ my $restoretime;
+
+ # don't do anything until connected
if (!defined($::client_id)) {
print "You must first ``connect''.\n";
return;
}
+ if ( ! $snaptable || ! defined $restoreto ) {
+ print "Usage: snaprestore \"restore to slot\" \"snaptable\" \"tableno\"\n";
+ return;
+ }
+
+ if ( ! -f $snaptable ) {
+ print "Table $snaptable doesn't exist\n";
+ return;
+ }
+
+ my $table = ReadSnapShotTable($snaptable);
+ $restoretime = FindSnapInTable($table, $restoreto);
+ if ( ! defined $table->{0} || ! defined $restoretime ) {
+ PrintSnapShotTable($table);
+ print "No current or $restoreto slot in this table\n";
+ return;
+ }
+
+ my $currentindex = $table->{0};
+ if ( $table->{$restoretime} == $currentindex ) {
+ print "You should not restore to the current snapshot\n";
+ return;
+ }
+
+ # swap the entries for 0 and $restoreto
+ my $tmp = $table->{$restoretime};
+ $table->{$restoretime} = $table->{0};
+ $table->{0} = $tmp;
+ # PrintSnapShotTable($table);
+
+ # write it back
+ WriteSnapShotTable($snaptable, $table);
+
+ # set it in the kernel
+ SnapSetTable($tableno, $snaptable);
+
+ # ready for the ioctl
my $err = 0;
my $type = "snap_obd";
- my $prevcurrent = shift;
-
- $data = pack("i", $prevcurrent); # where the previous current snapshot now lives
+ $data = pack("i", $currentindex); # slot of previous current snapshot
$datalen = 4;
my $len = length($type);
my $cl = length($data);
- my $add = pack("p", $data);
- print "type $type (len $len), datalen $datalen ($cl)\n";
my $packed = pack("Lipip", $::client_id, length($type), $type, $datalen, $data);
my $rc = ioctl(DEV_OBD, &OBD_SNAP_RESTORE, $packed);
if (!defined $rc) {
print STDERR "ioctl failed: $!\n";
} elsif ($rc eq "0 but true") {
- print "Finished (success)\n";
+ print "Snaprestore finished (success)\n";
+ delete $table->{$restoretime} if defined $restoretime;
+ # write it back
+ WriteSnapShotTable($snaptable, $table);
+
+ # set it in the kernel
+ SnapSetTable($tableno, $snaptable);
+ # PrintSnapShotTable($table);
+
} else {
print "ioctl returned error code $rc.\n";
}
}
+sub FindSnapInTable {
+ my $table = shift;
+ my $snapno =shift;
+ foreach my $restoretime ( keys %{$table} ) {
+ if ( $table->{$restoretime} == $snapno) {
+ print "Found key $restoretime for snapno $snapno\n";
+ return $restoretime;
+ }
+ }
+ undef;
+}
+
sub SnapPrint {
my $err = 0;
done:
my $ok = &readl("OK with new table? [Yn]: ");
- unless ( $ok eq "no" ) {
+ unless ( $ok eq "n" ) {
WriteSnapShotTable($file, $table);
}
}
sub Copy {
my $err = 0;
my $srcid = shift;
- my $tgtid = shift;
- my $data = pack("III", $::client_id, $srcid, $tgtid);
+ my $dstid = shift;
+
+ # Note: _copy IOCTL takes parameters as dst, src.
+ # Copy function takes parameters as src, dst.
+ my $data = pack("III", $::client_id, $dstid, $srcid);
my $datalen = 12;
my $packed = pack("ip", $datalen, $data);
sub Migrate {
my $err = 0;
my $srcid = shift;
- my $tgtid = shift;
- my $data = pack("III", $::client_id, $srcid, $tgtid);
+ my $dstid = shift;
+
+ # Note: _migr IOCTL takes parameters as dst, src.
+ # Migrate function takes parameters as src, dst.
+ my $data = pack("III", $::client_id, $dstid, $srcid);
my $datalen = 12;
my $packed = pack("ip", $datalen, $data);
sub Setup {
my $err = 0;
- my $type = shift;
+ my $arg = shift;
my $data;
my $datalen = 0;
-
- $type = "ext2_obd" unless $type;
- if ( $type eq "ext2_obd" ) {
- my $dev = shift;
+ # XXX we need a getinfo ioctl to validate parameters
+ # by type here
+
+ if ($arg && !defined($::st = stat($arg))) {
+ print "$arg is not a valid device\n";
+ return;
+ }
+
+ if ( $arg ) {
$dev = $::st->rdev() unless $dev;
$data = pack("i", $dev);
$datalen = 4;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff