RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

import mars-114.tgz

This commit is contained in:
Thomas Schoebel-Theuer 2011-07-05 08:07:06 +01:00
parent 5a2adead70
commit 2a4d50d2a5
3 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mars_aio.c
View File

@ -23,7 +23,6 @@
#define STRONG_MM #define STRONG_MM
#define MEMLEAK // FIXME: remove this #define MEMLEAK // FIXME: remove this
#define MEASURE_SYNC 8 #define MEASURE_SYNC 8
#define USE_CLEVER_SYNC
///////////////////////// own type definitions //////////////////////// ///////////////////////// own type definitions ////////////////////////
@ -606,9 +605,18 @@ void aio_clever_move(struct list_head *tmp_list, int prio, struct q_sync *q_sync
ph_insert_sync(&q_sync->heap[prio], &mref_a->heap_head); ph_insert_sync(&q_sync->heap[prio], &mref_a->heap_head);
} }
} }
static static
void aio_clever_sync(struct aio_output *output, struct q_sync *q_sync) void aio_clever_sync(struct aio_output *output, struct q_sync *q_sync)
{ {
int i;
int max = 64;
for (i = 0; i < MARS_PRIO_NR; i++) {
struct pairing_heap_sync **heap = &q_sync->heap[i];
if (*heap) {
return;
}
}
} }
#endif #endif

1
mars_aio.h
View File

@ -5,6 +5,7 @@
#include <linux/aio.h> #include <linux/aio.h>
#include <linux/syscalls.h> #include <linux/syscalls.h>
//#define USE_CLEVER_SYNC // TODO: NYI (should result in better write performance)
#ifdef USE_CLEVER_SYNC #ifdef USE_CLEVER_SYNC
#include "lib_pairing_heap.h" #include "lib_pairing_heap.h"

56
userspace/marsadm
View File

@ -193,8 +193,8 @@ sub nyi_cmd {
die "command '$cmd' is not yet implemented\n"; die "command '$cmd' is not yet implemented\n";
} }
sub _create_system { sub _create_cluster {
my ($cmd, $peer, $force) = @_; my ($cmd) = @_;
system("mkdir $mars") unless -d $mars; system("mkdir $mars") unless -d $mars;
system("mkdir $mars/ips") unless -d "$mars/ips"; system("mkdir $mars/ips") unless -d "$mars/ips";
system("mkdir $mars/defaults") unless -d "$mars/defaults"; system("mkdir $mars/defaults") unless -d "$mars/defaults";
@ -202,19 +202,19 @@ sub _create_system {
symlink($ip, "$mars/ips/ip-$host"); symlink($ip, "$mars/ips/ip-$host");
} }
sub create_system { sub create_cluster {
my ($cmd, $peer, $force) = @_; my ($cmd, $peer, $force) = @_;
die "system is already created\n" if !$force && -d "$mars/ips"; die "cluster is already created\n" if !$force && -d "$mars/ips";
_create_system(@_); _create_cluster(@_);
} }
sub join_system { sub join_cluster {
my ($cmd, $peer, $force) = @_; my ($cmd, $peer, $force) = @_;
if(glob("$mars/resource-*")) { if(glob("$mars/resource-*")) {
die "Sorry, some resources already exist!\nThis is dangerous!\nIf you are sure that no resource clash is possible, re-invoke this command with '--force' option\n" unless ($force and $force =~ m/--force/); die "Sorry, some resources already exist!\nThis is dangerous!\nIf you are sure that no resource clash is possible, re-invoke this command with '--force' option\n" unless ($force and $force =~ m/--force/);
} }
print "joining system via rsync (peer='$peer')\n"; print "joining cluster via rsync (peer='$peer')\n";
_create_system(@_); _create_cluster(@_);
system("rsync --recursive --links -v $peer:$mars/ips/ $mars/ips/") == 0 or die "oops\n"; system("rsync --recursive --links -v $peer:$mars/ips/ $mars/ips/") == 0 or die "oops\n";
symlink($ip, "$mars/ips/ip-$host"); symlink($ip, "$mars/ips/ip-$host");
system("rsync --recursive --links -v $mars/ips/ $peer:$mars/ips/") == 0 or die "oops\n"; system("rsync --recursive --links -v $mars/ips/ $peer:$mars/ips/") == 0 or die "oops\n";
@ -253,7 +253,7 @@ sub create_res {
my $primary; my $primary;
my $replay; my $replay;
if($create) { if($create) {
_create_system(@_); _create_cluster(@_);
system("rm -rf $tmp"); system("rm -rf $tmp");
system("mkdir $tmp") == 0 or die "could not create resource '$res'\n"; system("mkdir $tmp") == 0 or die "could not create resource '$res'\n";
symlink($size, "$tmp/size") or die "cannot create size indicator symlink\n"; symlink($size, "$tmp/size") or die "cannot create size indicator symlink\n";
@ -262,7 +262,7 @@ sub create_res {
die "resource '$res' does not exist\n" unless -d $tmp; die "resource '$res' does not exist\n" unless -d $tmp;
$primary = readlink("$tmp/primary") or die "cannot determine primary\n"; $primary = readlink("$tmp/primary") or die "cannot determine primary\n";
die "resource '$res' is already joined\n" if -e "$tmp/data-$host"; die "resource '$res' is already joined\n" if -e "$tmp/data-$host";
die "my ip '$ip' is not registered -- please run 'join-system' first\n" unless -l "$mars/ips/ip-$host"; die "my ip '$ip' is not registered -- please run 'join-cluster' first\n" unless -l "$mars/ips/ip-$host";
my $oldsize = readlink("$tmp/size") or die "cannot determine old size\n"; my $oldsize = readlink("$tmp/size") or die "cannot determine old size\n";
if($size < $oldsize) { if($size < $oldsize) {
print "adjusting size to $oldsize\n"; print "adjusting size to $oldsize\n";
@ -297,7 +297,7 @@ sub create_res {
mkdir("$tmp/actual-$host"); mkdir("$tmp/actual-$host");
mkdir("$tmp/switch-$host"); mkdir("$tmp/switch-$host");
symlink("1", "$tmp/switch-$host/attach"); symlink("1", "$tmp/switch-$host/attach");
symlink("1", "$tmp/switch-$host/connect"); symlink("0", "$tmp/switch-$host/connect");
symlink("1", "$tmp/switch-$host/sync"); symlink("1", "$tmp/switch-$host/sync");
system("rm -f $tmp/syncstatus-$host"); system("rm -f $tmp/syncstatus-$host");
@ -305,6 +305,7 @@ sub create_res {
symlink($host, "$tmp/primary") or die "cannot create primary symlink\n"; symlink($host, "$tmp/primary") or die "cannot create primary symlink\n";
symlink($size, "$tmp/syncstatus-$host") or die "cannot create primary syncstatus\n"; symlink($size, "$tmp/syncstatus-$host") or die "cannot create primary syncstatus\n";
symlink("log-000000001-$host,0,0", "$tmp/replay-$host") or die "cannot create replay status\n"; symlink("log-000000001-$host,0,0", "$tmp/replay-$host") or die "cannot create replay status\n";
system("touch $tmp/log-000000001-$host");
rename($tmp, "$mars/resource-$res") or die "cannot finalize resource '$res'\n"; rename($tmp, "$mars/resource-$res") or die "cannot finalize resource '$res'\n";
print "successfully created resource '$res'\n"; print "successfully created resource '$res'\n";
} else { } else {
@ -328,6 +329,15 @@ sub attach_res {
sub connect_res { sub connect_res {
my ($cmd, $res) = @_; my ($cmd, $res) = @_;
my $disconnect = ($cmd eq "disconnect"); my $disconnect = ($cmd eq "disconnect");
my @paths = glob("$mars/resource-$res/switch-*/connect");
for my $path (@paths) {
_switch($cmd, $res, $path, !$disconnect);
}
}
sub connect_local_res {
my ($cmd, $res) = @_;
my $disconnect = ($cmd eq "disconnect-local");
my $path = "$mars/resource-$res/switch-$host/connect"; my $path = "$mars/resource-$res/switch-$host/connect";
_switch($cmd, $res, $path, !$disconnect); _switch($cmd, $res, $path, !$disconnect);
} }
@ -335,6 +345,15 @@ sub connect_res {
sub pause_res { sub pause_res {
my ($cmd, $res) = @_; my ($cmd, $res) = @_;
my $pause = ($cmd eq "pause-sync"); my $pause = ($cmd eq "pause-sync");
my @paths = glob("$mars/resource-$res/switch-*/sync");
for my $path (@paths) {
_switch($cmd, $res, $path, !$pause);
}
}
sub pause_local_res {
my ($cmd, $res) = @_;
my $pause = ($cmd eq "pause-sync-local");
my $path = "$mars/resource-$res/switch-$host/sync"; my $path = "$mars/resource-$res/switch-$host/sync";
_switch($cmd, $res, $path, !$pause); _switch($cmd, $res, $path, !$pause);
} }
@ -373,6 +392,8 @@ sub primary_res {
} elsif($old eq $host) { } elsif($old eq $host) {
print "I am already primary.\n"; print "I am already primary.\n";
exit(0); exit(0);
} elsif($cmd eq "force-primary") {
print "forcing myself ($host) to primary...\n";
} else { # try to switch myself to primary } else { # try to switch myself to primary
print "trying to switch $host to primary...\n"; print "trying to switch $host to primary...\n";
check_sync_finished($res, $host); check_sync_finished($res, $host);
@ -411,8 +432,8 @@ sub role_cmd {
my %cmd_table = my %cmd_table =
( (
# new keywords # new keywords
"create-system" => \&create_system, "create-cluster" => \&create_cluster,
"join-system" => \&join_system, "join-cluster" => \&join_cluster,
"create-resource" => \&create_res, "create-resource" => \&create_res,
"join-resource" => \&create_res, "join-resource" => \&create_res,
@ -421,11 +442,14 @@ my %cmd_table =
"detach" => \&attach_res, "detach" => \&attach_res,
"connect" => \&connect_res, "connect" => \&connect_res,
"disconnect" => \&connect_res, "disconnect" => \&connect_res,
"connect-local" => \&connect_local_res,
"disconnect-local" => \&connect_local_res,
"syncer" => \&ignore_cmd, "syncer" => \&ignore_cmd,
"up" => \&up_res, "up" => \&up_res,
"down" => \&up_res, "down" => \&up_res,
"primary" => \&primary_res, "primary" => \&primary_res,
"secondary" => \&primary_res, "secondary" => \&primary_res,
"force-primary" => \&primary_res,
"invalidate" => \&invalidate_res, "invalidate" => \&invalidate_res,
"invalidate-remote" => \&forbidden_cmd, "invalidate-remote" => \&forbidden_cmd,
"resize" => \&nyi_cmd, "resize" => \&nyi_cmd,
@ -444,6 +468,8 @@ my %cmd_table =
"verify" => \&nyi_cmd, "verify" => \&nyi_cmd,
"pause-sync" => \&pause_res, "pause-sync" => \&pause_res,
"resume-sync" => \&pause_res, "resume-sync" => \&pause_res,
"pause-sync-local" => \&pause_local_res,
"resume-sync-local" => \&pause_local_res,
"new-current-uuid" => \&senseless_cmd, "new-current-uuid" => \&senseless_cmd,
"dstate" => \&nyi_cmd, "dstate" => \&nyi_cmd,
"hidden-commands" => \&ignore_cmd, "hidden-commands" => \&ignore_cmd,
@ -459,8 +485,8 @@ sub do_res {
my $cmd = shift; my $cmd = shift;
my $res = shift; my $res = shift;
$res = check_res($res) unless $cmd =~ m/^(join-system|create-resource)$/; $res = check_res($res) unless $cmd =~ m/^(join-cluster|create-resource)$/;
check_res_member($res) unless $cmd =~ m/^(join|create)-(system|resource)$/; check_res_member($res) unless $cmd =~ m/^(join|create)-(cluster|resource)$/;
my $func = $cmd_table{$cmd}; my $func = $cmd_table{$cmd};
&{$func}($cmd, $res, @_); &{$func}($cmd, $res, @_);