sub slice_dir_port {
my ($self,$slice) = @_;
my ( undef, $dir, $port, undef ) = getgrnam($slice);
+ die "getgrnam $slice: $!" if $!;
warn "# slice_dir_port $slice = $dir $port\n";
return ( $dir, $port );
}
while(<$fh>) {
my ( $login, $passwd, $uid, $gid, $email, $dir, $shell ) = split(/:/,$_);
$max_uid = $uid if $uid > $max_uid;
- $found = $uid if $email eq $new_email;
+ $found = $login if $email eq $new_email;
}
close($fh);
my $slice = $ENV{SLICE} || 's1';
+ $slice =~ s{/.+/(\w+)$}{$1};
my ( $dir, $port ) = $self->slice_dir_port( $slice );
+ $dir ||= $ENV{SLICE};
+ $port ||= 6501;
+
if ( ! $found ) {
$max_uid++;
$dir .= "/$max_uid";
open(my $fh, '>>', $self->{passwd});
print $fh "u$max_uid:$new_passwd:$max_uid:$port:$new_email:$dir:/bin/true\n";
close($fh);
- $found = $max_uid;
+ $found = "u$max_uid";
mkdir $dir;
chown $max_uid, $port, $dir;
}
sub user_dir {
- my ( $self,$user, $dir ) = @_;
+ my ( $self, $user, $dir ) = @_;
$user = $self->user_info($user) unless ref $user eq 'HASH';
my $path;
if ( exists $user->{dir} ) {
sub usage {
my ( $self, $user ) = @_;
$user = $self->user_info($user) unless ref $user eq 'HASH';
+
+ my $usage_path = $user->{dir} . '/.meta/files.usage';
+ $self->mkbasepath( $usage_path, { uid => $user->{uid} } );
+ if ( ! -e $usage_path ) {
+ warn "# usage $usage_path missing";
+ $self->list_files($user);
+ }
+
+ open(my $fh, '<', $usage_path);
+ my $size = <$fh>;
+ chomp $size;
+
+ warn "# usage $user->{login} $size bytes\n";
+ return $size;
+
+=for slow and broken
+
my $path = $self->user_dir( $user => 'usage');
my $sum;
open(my $fh, '<', $path);
$sum->{_quota} = $quota;
warn "## usage ",dump($user, $sum), $/;
return $sum;
+
+=cut
+
}
sub send_file {
$self->delete( $t, $t_path ) if -e $t_full;
- my $ok = link $f_full, $t_full;
- $self->append( $t, 'recv', -s $t_full, $f->{uid}, $t_path );
-
- $ok = -s $t_full if $ok; # replace true with file size
-
+ my $size = -s $f_full;
my $md5;
- if ( $f->{uid} == $self->{md5}->{uid} ) {
- $md5 = $f_path; # we don't have local md5sum db for md5 user!
+
+ my $ok;
+ {
+ no autodie qw(link);
+ $ok = link $f_full, $t_full
+ };
+ if ( ! $ok || $! =~ m/cross-link/ ) {
+ $ok = symlink $f_full, $t_full;
} else {
- $md5 = $self->md5_get($f_full);
- }
- if ( ! $md5 ) {
- warn "ERROR: no md5 for $f_path";
- return $ok;
+ $size = -s $t_full;
+
+ if ( $f->{uid} == $self->{md5}->{uid} ) {
+ $md5 = $f_path; # we don't have local md5sum db for md5 user!
+ } else {
+ $md5 = $self->md5_get($f_full);
+ }
+
}
- $self->append_meta('md5sum', $t, $md5 => $t_path ); # md5sum for received files!
+ if ( $ok ) {
+ $self->append( $t, 'recv', $size, $f->{uid}, $t_path );
+ $self->append_meta('md5sum', $t, $md5 => $t_path ) if $md5; # md5sum for received files! FIXME -- cross-slice md5
+ $self->refresh_file_list( $t );
+ } else {
+ warn "ERROR: send_file $f_full -> $t_full: $!";
+ }
- return $ok;
+ return $size;
}
sub rename_file {
$self->mkbasepath( $t_full, { uid => $user->{uid}, gid => $user->{gid} } );
my $ok = rename $f_full, $t_full;
+ $self->refresh_file_list( $user );
+
my $md5 = $self->md5_get($t_full);
if ( ! $md5 ) {
warn "ERROR: no md5sum for $from";
$self->append( $user, 'delete', -$deleted_size, $user->{uid}, $path );
$self->append_meta('md5sum', $user, 'delete', $path );
+ $self->refresh_file_list( $user );
+
return $full_path;
}
$user = $self->user_info($user) unless ref $user eq 'HASH';
my $full_path = "$user->{dir}/$path";
- return -s $full_path;
+ my $size = -s $full_path;
+ warn "# file_size $full_path = $size bytes\n";
+ return $size;
+}
+
+sub list_files {
+ my ( $self, $user, $path ) = @_;
+
+ $user =~ s{/+$}{} && warn "cleanup list_files arg [$user]";
+
+ $user = $self->user_info($user) unless ref $user eq 'HASH';
+
+ die "no dir for ",dump($user) unless exists $user->{dir};
+
+ my $files = $user->{dir} . '/.meta/files';
+ $self->mkbasepath( $files, { uid => $user->{uid} } );
+ if ( -e $files && -s $files > 0 && -e "$files.usage") {
+ local $/ = undef;
+ open(my $fh, '<', $files);
+ my $list = <$fh>;
+ close($fh);
+ warn "# list_files $user->{login} cached ", length($list), " bytes";
+ return $list;
+ }
+
+ my $dir = $user->{dir};
+ open(my $pipe, '-|', qq|find -L $dir -printf "%y %s %p\n"|);
+ open(my $fh, '>', "$files.new");
+ my $total_usage = 0;
+ my $list_txt;
+ while(<$pipe>) {
+ chomp;
+ my ( $type, $size, $name ) = split(/\s/, $_);
+ $name =~ s{$dir}{./};
+ $name =~ s{//+}{/}g;
+ my $line = "$type $size $name\n";
+ print $fh $line;
+ $list_txt .= $line;
+ $total_usage += $size;
+ }
+ close($pipe);
+ close($fh);
+ rename "$files.new", $files;
+
+ open(my $usage, '>', "$files.usage.new");
+ print $usage $total_usage;
+ close($usage);
+ rename "$files.usage.new", "$files.usage";
+
+ warn "# list_files $dir usage: $total_usage\n";
+
+ return $list_txt;
+}
+
+sub refresh_file_list {
+ my ( $self, $user ) = @_;
+ $user = $self->user_info($user) unless ref $user eq 'HASH';
+ my $full_path = "$user->{dir}/.meta/files";
+ if ( -e $full_path ) {
+ warn "## refresh_file_list $full_path";
+ unlink $full_path || warn "unlink $full_path: $!";
+ } else {
+ warn "## refresh_file_list $full_path missing";
+ }
+
+ unlink "$full_path.usage" if -e "$full_path.usage";
}
1;
projects / cloudstore.git / blobdiff