use Time::HiRes;
use Data::Dump qw(dump);
use English;
+use Module::Refresh;
use lib 'lib';
-use CloudStore::JSON;
-use CloudStore::dedup;
+use WarnColor;
+use CloudStore::Store;
-my $dir = $ENV{RSYNC_DIR} || '/srv/cloudstore';
-my $port = $ENV{RSYNC_PORT} || 6501;
-my $users = "users";
+my $slice = $ARGV[0] || 's1';
-my $log_fifo = "$dir/var/$port.log";
-my $pid_file = "$dir/var/$port.pid";
-my $cfg_file = "$dir/var/$port.conf";
+my ( undef, $dir, $port, undef ) = getgrnam($slice);
+
+my $log_fifo = "$dir/$port.log";
+my $pid_file = "$dir/$port.pid";
+my $cfg_file = "$dir/$port.conf";
my $rsync = 'rsync';
$rsync = 'bin/rsync' if -x 'bin/rsync'; # use 3.1dev version!
my $transfer_log = join('|',map { ( split(/:/,$_,3) )[1] } @transfer );
if ( $ENV{SQL} ) {
- print "CREATE TABLE rsync_transfer (\n\t",
+ warn "CREATE TABLE rsync_transfer (\n\t",
join(",\n\t", map { my @m = split(/:/,$_,3); "$m[0] $m[2]" } @transfer),
"\n);\n";
exit 1;
}
-mkdir "$dir/var" if ! -e "$dir/var";
+my $store = CloudStore::Store->new( $slice );
unlink $log_fifo if -f $log_fifo;
mkfifo $log_fifo, 0700 unless -p $log_fifo;
+sub rsync_rebuild_config {
+
my $rsync_config = qq{
#uid = nobody
use chroot = no
#max connections = 4
-lock file = $dir/var/$port.lock
+lock file = $dir/$port.lock
#syslog facility = local5
log file = $log_fifo
# don't check secrets file permission (uid)
strict modes = no
-#pre-xfer exec = /srv/cloudstore/pre-xfer.sh
-#post-xfer exec = /srv/cloudstore/post-xfer.sh
+#pre-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
+#post-xfer exec = /srv/cloudstore/rsync-xfer-trigger.pl
+
+# inplace breaks update of deduped files
+refuse options = inplace
};
-foreach my $path ( glob "$users/*" ) {
+open(my $p, '<', '/var/lib/extrausers/passwd');
+while(<$p>) {
+ chomp;
- my $login = $path;
- $login =~ s{^.+/([^/]+)$}{$1};
+ my ( $login, undef, $uid, $gid, $email, $path, $shell ) = split(/:/,$_,7);
- if ( -d $path && -d "$path/blob" && -f "$path/secrets" ) {
- my @secrets = map { chomp; $_ } read_file "$path/secrets";
+ if ( -d $path && -f "$path/.secrets" && ! -e "$path/.meta/secrets" ) {
+ $store->api->mkbasepath( "$path/.meta/secrets" );
+ rename "$path/.secrets", "$path/.meta/secrets";
+ warn "UPGRADE $login rsync secrets location\n";
+ }
+
+ if ( -d $path && -f "$path/.meta/secrets" ) {
+ my @secrets = map { chomp; $_ } read_file "$path/.meta/secrets";
my $auth_users = join(', ', map { s/:.+$//; $_ } @secrets );
$rsync_config .= <<__RSYNC_MODULE__;
[$login]
- path = $dir/users/$login/blob
+ path = $path
auth users = $auth_users
- secrets file = $dir/users/$login/secrets
+ secrets file = $path/.meta/secrets
read only = false
+ uid = $uid
+ gid = $gid
+ filter = - /.meta
+# refuse options = c delete
+# dont compress = *
+ incoming chmod = u=rwX,g+rX,o+rX
+
__RSYNC_MODULE__
- print "INFO: added $login = $auth_users\n";
+ warn "INFO: added $login = $auth_users\n";
} else {
warn "skipped $login: $!";
write_file $cfg_file, $rsync_config;
warn "created $cfg_file ", -s $cfg_file, " bytes\n";
-if ( -e $pid_file ) {
+} # sub rsync_rebuild_config
+
+rsync_rebuild_config;
+
+sub rsync_running_pid {
+ return unless -e $pid_file;
my $pid = read_file $pid_file;
chomp($pid);
+ return $pid;
+}
+
+if ( my $pid = rsync_running_pid ) {
if ( kill 0, $pid ) {
- warn "found rsync pid $pid";
+ warn "found rsync pid $pid\n";
+ kill 1, $pid && warn "reload config";
+=for kill-rsync
kill 2, $pid;
while ( -e $pid_file ) {
- warn "waiting for rsync to die...";
+ warn "waiting for rsync to die...\n";
sleep 1;
}
+
+ open(my $fifo, '<', $log_fifo);
+ while ( kill 0, $pid ) {
+ my $line = <$fifo>;
+ warn "<<< $line\n";
+ }
+
+ kill 0, $pid && die "can't kill it!";
+=cut
} else {
unlink $pid_file;
}
}
-if ( ! -e $pid_file ) {
+use POSIX ":sys_wait_h";
+sub REAPER {
+ my $child;
+ while ((my $waitedpid = waitpid(-1,WNOHANG)) > 0) {
+ warn "reaped $waitedpid" . ($? ? " with exit $?" : '');
+ }
+ $SIG{CHLD} = \&REAPER; # loathe SysV
+}
+
+$SIG{CHLD} = \&REAPER;
+
+
+if ( ! -e $pid_file || ! kill( 0, rsync_running_pid ) ) {
my $exec = "$rsync --daemon --config $cfg_file --no-detach --port=$port";
warn "START $exec\n";
=cut
while(1) {
- warn "# reading log output from $log_fifo\n";
+ die "no rsync running" unless kill 0, rsync_running_pid;
+ warn "waiting for log from $log_fifo\n";
open(my $fifo, '<', $log_fifo);
while( my $line = <$fifo> ) {
- die $line if $line =~ /rsync error:/;
+ Module::Refresh->refresh;
chomp $line;
- print $line, $/;
+ warn $line, $/;
- if ( $line =~ /transfer-log:(.+)/ ) {
- my $transfer = $1;
+ if ( $line =~ /\[(\d+)\] transfer-log:(.+)/ ) {
+ my $pid = $1;
+ my $transfer = $2;
$transfer =~ s|(\d\d\d\d)/(\d\d)/(\d\d)[-\s](\d\d:\d\d:\d\d)|$1-$2-$3T$4|g;
my ( $yyyy,$mm,$dd,undef,$login,undef ) = split( /[\-T\|]/, $transfer, 6 );
my $host = $1 if $login =~ s/\+(.+)//;
+if(0) {
my $path = "users/$login/log";
mkdir $path unless -d $path;
$path .= "/$yyyy-$mm-$dd";
print $log join('|',@transfer),"\n" if $new_log; # store header
print $log "$transfer\n";
close $log;
+}
my @v = split(/\|/,$transfer,$#transfer + 1);
my %data;
@data{@transfer_names} = @v ; # FIXME validate?
- print ">>> data ",dump( \%data ) if $ENV{DEBUG};
+ $data{pid} = $pid;
+ # overwrite pid from transfer log with consistant one for start/stop
- CloudStore::dedup::data \%data; # uses deleted json files!
-
- my $json = CloudStore::JSON::rsync_transfer \%data;
+ print ">>> data ",dump( \%data ) if $ENV{DEBUG};
+ $store->rsync_transfer( \%data );
=for gearman
$gearman->dispatch_background( 'rsync_transfer' => $json );
=cut
+ die "no rsync running" unless kill 0, rsync_running_pid;
+ } elsif ( $line =~ m/(unknown module|rebuild|reload|config)/ ) {
+ warn "refresh modules, rebuild config and HUP rsync";
+ Module::Refresh->refresh;
+ rsync_rebuild_config;
+ my $pid = rsync_running_pid;
+ kill 1, $pid && warn "reload config";
+ } else {
+ $store->rsync_log( $line );
}
}
close($fifo);
projects / cloudstore.git / blobdiff