v42.

We trigger redownloads from the server if the timestamp of
downloaded tar files is too new. An easy way around this issue
is to request the timestamp from the server instead of using
the download time. A `touch` of the tar then assures that
the downloaded file has the same timestamp as the server has.

clr_debug_daemon.service

@@ -4,6 +4,7 @@ Description=Clear Linux debuginfo daemon
 [Service]
 Type=simple
 ExecStart=/usr/bin/clr_debug_daemon
+DefaultDependencies=no
 
 [Install]
 WantedBy=multi-user.target

clr_debug_fuse.service

@@ -5,6 +5,7 @@ After=clr_debug_daemon.service
 [Service]
 Type=simple
 ExecStart=/usr/bin/clr_debug_fuse
+DefaultDependencies=no
 
 [Install]
 WantedBy=multi-user.target

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.66])
-AC_INIT(clr-debug-info, 32, arjan@linux.intel.com)
+AC_INIT(clr-debug-info, 42, arjan@linux.intel.com)
 AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
 AM_SILENT_RULES([yes])
 AC_PROG_CC

src/client.c

@@ -85,6 +85,7 @@ void try_to_get(const char *path, int pid, time_t timestamp)
         if (ret == 0 && cred.pid == pid) {
                 printf("Recursion\n");
                 close(sockfd);
+                return;
         }
 
         command = NULL;

src/nica/files.c

@@ -113,7 +113,7 @@ bool nc_copy_file(const char *src, const char *dst, mode_t mode, bool remove_tar
         while (true) {
                 if ((r = read(src_fd, &buffer, sizeof(buffer))) < 0) {
                         ret = false;
-                        break;
+                        goto end;
                 }
                 if (write(dest_fd, buffer, sizeof(buffer)) != r) {
                         break;

src/nica/hashmap.c

@@ -123,8 +123,8 @@ static inline unsigned nc_hashmap_get_hash(NcHashmap *self, const void *key)
         return hash;
 }
 
-static bool nc_hashmap_insert_bucket(NcHashmap *self, NcHashmapEntry *buckets, int n_buckets,
+static int nc_hashmap_insert_bucket(NcHashmap *self, NcHashmapEntry *buckets, int n_buckets,
-                                     unsigned hash, const void *key, void *value)
+                                    unsigned hash, const void *key, void *value)
 {
         NcHashmapEntry *row = &(buckets[hash % n_buckets]);
         NcHashmapEntry *head = NULL;
@@ -458,10 +458,12 @@ bool nc_hashmap_iter_next(NcHashmapIter *citer, void **key, void **value)
                         }
                         item = &(map->buckets[iter->bucket]);
                 }
-                if (item && item->occ) {
+                if (item) {
-                        goto success;
+                        if (item->occ) {
+                                goto success;
+                        }
+                        item = item->next;
                 }
-                item = item->next;
         }
         return false;
 

src/server.c

@@ -55,8 +55,8 @@
 
 static pthread_mutex_t dupes_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-char *urls[2] = { "https://debuginfo.clearlinux.org/debuginfo/",
+char *urls[2] = { "https://cdn.download.clearlinux.org/debuginfo/",
-                  "https://debuginfo.clearlinux.org/debuginfo/" };
+                  "https://cdn.download.clearlinux.org/debuginfo/" };
 int urlcounter = 1;
 
 static NcHashmap *hash = NULL;
@@ -162,6 +162,7 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
 {
         CURLcode code;
         long ret;
+        long changed;
         int fd;
         char filename[PATH_MAX];
         CURL *curl = NULL;
@@ -189,6 +190,22 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
 
         curl_easy_setopt(curl, CURLOPT_URL, url);
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, file);
+        curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
+
+        /*
+         * Some sane timeout values to prevent stalls
+         *
+         * Connect timeout is for first connection to the server.
+         * The low speed timeout is for slow downloads. Since many
+         * files are several mB large, we want to prevent them from
+         * taking forever. (1kB/sec avg over 30secs).
+         */
+        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 30);
+        curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 30);
+        curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1024);
+
+        /* request timestamp of files from server */
+        curl_easy_setopt(curl, CURLOPT_FILETIME, 1);
 
         if (timestamp) {
                 curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
@@ -217,6 +234,17 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
         }
 
         if (ret == 200) {
+                /* get timestamp, if any */
+                curl_easy_getinfo(curl, CURLINFO_FILETIME, &changed);
+                if (changed >= 0) {
+                        struct timespec times[2];
+                        times[0].tv_sec = (time_t)changed;
+                        times[0].tv_nsec = 0;
+                        times[1].tv_sec = (time_t)changed;
+                        times[1].tv_nsec = 0;
+                        futimens(fd, times);
+                }
+
                 autofree(char) *command = NULL;
                 //		printf("Filename is %s\n", filename);
 
@@ -224,7 +252,7 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
                 stat(filename, &statbuf);
                 if (statbuf.st_size > 0 &&
                     asprintf(&command,
-                             "tar -C /var/cache/debuginfo/%s --no-same-owner  -xf %s",
+                             "tar -C /var/cache/debuginfo/%s --no-same-owner  --no-same-permissions  -xf %s",
                              prefix,
                              filename) >= 0) {
                         if (system(command) != 0) {
@@ -269,7 +297,6 @@ static void *server_thread(void *arg)
         if (ret < 0) {
                 goto thread_end;
         }
-        prefix = buf;
         c = strchr(buf, ':');
         if (!c) {
                 goto thread_end;
@@ -322,6 +349,7 @@ static void *server_thread(void *arg)
         }
 
         gettimeofday(&after, NULL);
+#if 0        
         if (timedelta(before, after) > 0.6)
                 printf("Request for %s took %5.2f seconds (%i - %i)\n",
                        url,
@@ -329,7 +357,7 @@ static void *server_thread(void *arg)
                            (1.0 * after.tv_usec - before.tv_usec) / 1000000.0,
                        ret,
                        (int)timestamp);
-
+#endif
         /* tell the other side we're done with the download */
         wr = write(fd, "ok", 3);