Merge 7b4f26f into f4df3d1

lib/Bio/EnsEMBL/DataCheck/Manager.pm

@@ -167,7 +167,21 @@ sub load_config {
   if (defined $self->config_file) {
     die "Config file does not exist" unless -e $self->config_file;
 
-    my $json = path($self->config_file)->slurp;
+    # 'slurp' gets an exclusive lock on the file before reading it.
+    # But sometimes we get flock problems, if a bunch of datachecks
+    # are all completing very quickly, so have a brief pause to
+    # calm things down a bit. That doesn't always work, so give
+    # it a second go if the first attempt fails.
+    my $json;
+    eval {
+      sleep(int(rand(10)));
+      $json = path($self->config_file)->slurp;
+    };
+    if ($@) {
+      sleep(int(rand(10)));
+      $json = path($self->config_file)->slurp;
+    }
+
     my %config;
     eval {
       %config = %{ JSON->new->decode($json) };
@@ -374,12 +388,12 @@ sub read_history {
     # calm things down a bit. That doesn't always work, so give
     # it a second go if the first attempt fails.
     eval {
-      sleep(2);
+      sleep(int(rand(10)));
       my $json = path($self->history_file)->slurp;
       %history = %{ JSON->new->decode($json) };
     };
     if ($@) {
-      sleep(2);
+      sleep(int(rand(10)));
       my $json = path($self->history_file)->slurp;
       %history = %{ JSON->new->decode($json) };
     }