/[BackupPC]/trunk/bin/BackupPC_updatedb

This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!

Diff of /trunk/bin/BackupPC_updatedb

Parent Directory | Revision Log | View Patch Patch

-revision 242 by dpavlin,
Fri Nov 18 19:40:47 2005 UTC
+revision 250 by dpavlin,
Sun Dec 11 14:27:45 2005 UTC
 Line 12 
 use Time::HiRes qw/time/;
  use File::Pid;
  use POSIX qw/strftime/;
  use BackupPC::SearchLib;
+ use Cwd qw/abs_path/;
  use constant BPC_FTYPE_DIR => 5;
  use constant EST_CHUNK => 100000;
+ # daylight saving time change offset for 1h
+ my $dst_offset = 60 * 60;
  my $debug = 0;
  $|=1;
  my $start_t = time();
- my $pidfile = new File::Pid;
+ my $pid_path = abs_path($0);
+ $pid_path =~ s/\W+/_/g;
+ my $pidfile = new File::Pid({
+         file => "/tmp/$pid_path",
+ });
  if (my $pid = $pidfile->running ) {
          die "$0 already running: $pid\n";
-Line 29 
 if (my $pid = $pidfile->running ) {
+Line 38 
 if (my $pid = $pidfile->running ) {
          $pidfile->remove;
          $pidfile = new File::Pid;
  }
- $pidfile->write;
  print STDERR "$0 using pid ",$pidfile->pid," file ",$pidfile->file,"\n";
+ $pidfile->write;
  my $t_fmt = '%Y-%m-%d %H:%M:%S';
-Line 50 
 my $dbh = DBI->connect($dsn, $user, "",
+Line 59 
 my $dbh = DBI->connect($dsn, $user, "",
  my %opt;
- if ( !getopts("cdm:v:ij", \%opt ) ) {
+ if ( !getopts("cdm:v:ijf", \%opt ) ) {
          print STDERR <<EOF;
- usage: $0 [-c|-d] [-m num] [-v|-v level] [-i]
+ usage: $0 [-c|-d] [-m num] [-v|-v level] [-i|-j|-f]
  Options:
          -c      create database on first use
-Line 61 
 Options:
+Line 70 
 Options:
          -v num  set verbosity (debug) level (default $debug)
          -i      update Hyper Estraier full text index
          -j      update full text, don't check existing files
+         -f      don't do anything with full text index
  Option -j is variation on -i. It will allow faster initial creation
  of full-text index from existing database.
+ Option -f will create database which is out of sync with full text index. You
+ will have to re-run $0 with -i to fix it.
  EOF
          exit 1;
  }
-Line 72 
 EOF
+Line 85 
 EOF
  if ($opt{v}) {
          print "Debug level at $opt{v}\n";
          $debug = $opt{v};
+ } elsif ($opt{f}) {
+         print "WARNING: disabling full-text index update. You need to re-run $0 -j !\n";
+         ($use_hest, $index_path, $index_node_url) = (undef, undef, undef);
  }
  #---- subs ----
-Line 111 
 sub hest_update {
+Line 127 
 sub hest_update {
          my $skip_check = $opt{j} && print STDERR "Skipping check for existing files -- this should be used only with initital import\n";
-         unless ($use_hest) {
+         unless (defined($use_hest)) {
                  print STDERR "HyperEstraier support not enabled in configuration\n";
+                 $use_hest = 0;
                  return;
          }
+         return unless($use_hest);
          print curr_time," updating HyperEstraier:";
          my $t = time();
-Line 448 
 INSERT INTO files
+Line 467 
 INSERT INTO files
          VALUES (?,?,?,?,?,?,?)
  });
- foreach my $host_key (keys %{$hosts}) {
+ my @hosts = keys %{$hosts};
+ my $host_nr = 0;
+ foreach my $host_key (@hosts) {
          my $hostname = $hosts->{$host_key}->{'host'} || die "can't find host for $host_key";
-Line 463 
 foreach my $host_key (keys %{$hosts}) {
+Line 485 
 foreach my $host_key (keys %{$hosts}) {
                  $hostID = $dbh->last_insert_id(undef,undef,'hosts',undef);
          }
-         print "host ".$hosts->{$host_key}->{'host'}.": ";
+         $host_nr++;
+         print "host ", $hosts->{$host_key}->{'host'}, " [",
+                 $host_nr, "/", ($#hosts + 1), "]: ";
          # get backups for a host
          my @backups = $bpc->BackupInfoRead($hostname);
-Line 515 
 foreach my $host_key (keys %{$hosts}) {
+Line 539 
 foreach my $host_key (keys %{$hosts}) {
                          my ($f, $nf, $d, $nd, $size) = recurseDir($bpc, $hostname, $files, $backupNum, $share, "", $shareID);
-                         $sth->{update_backups_size}->execute(
+                         eval {
-                                 $size,
+                                 $sth->{update_backups_size}->execute(
-                                 $hostID,
+                                         $size,
-                                 $backupNum,
+                                         $hostID,
-                                 $backup->{'endTime'},
+                                         $backupNum,
-                                 substr($backup->{'type'},0,4),
+                                         $backup->{'endTime'},
-                                 $shareID,
+                                         substr($backup->{'type'},0,4),
-                         );
+                                         $shareID,
+                                 );
-                         print " commit";
+                                 print " commit";
-                         $dbh->commit();
+                                 $dbh->commit();
+                         };
+                         if ($@) {
+                                 print " rollback";
+                                 $dbh->rollback();
+                         }
                          my $dur = (time() - $t) || 1;
                          printf(" %d/%d files %d/%d dirs %0.2f MB [%.2f/s dur: %s]\n",
-Line 588 
 sub found_in_db {
+Line 617 
 sub found_in_db {
                  SELECT 1 FROM files
                  WHERE shareID = ? and
                          path = ? and
-                         date = ? and
+                         size = ? and
-                         size = ?
+                         ( date = ? or date = ? or date = ? )
                  LIMIT 1
          });
-         my @param = ($shareID,$path,$date,$size);
+         my @param = ($shareID,$path,$size,$date, $date-$dst_offset, $date+$dst_offset);
          $sth->{file_in_db}->execute(@param);
          my $rows = $sth->{file_in_db}->rows;
          print STDERR "## found_in_db($shareID,$path,$date,$size) ",( $rows ? '+' : '-' ), join(" ",@param), "\n" if ($debug >= 3);
-Line 643 
 sub recurseDir($$$$$$$$) {
+Line 672 
 sub recurseDir($$$$$$$$) {
                                  $filesInBackup->{$path_key}->{'size'}
                          ));
-                         # daylight saving time change offset for 1h
-                         my $dst_offset = 60 * 60;
                          my $key_dst_prev = join(" ", (
                                  $shareID,
                                  $dir,

 Legend:



Removed from v.242
 


changed lines


 
Added in v.250
 Legend:



Removed from v.242
 


changed lines


 
Added in v.250
-Removed from v.242
+Added in v.250

	ViewVC Help
Powered by ViewVC 1.1.26