trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject git commit: TS-2257 More fixes for healtchecks plugin losing events
Date Sat, 05 Oct 2013 16:50:10 GMT
Updated Branches:
  refs/heads/master ae7b3f942 -> 196cd66f1


TS-2257 More fixes for healtchecks plugin losing events


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/196cd66f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/196cd66f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/196cd66f

Branch: refs/heads/master
Commit: 196cd66f1e35b5cfd92215b81f17b1c594dfd539
Parents: ae7b3f9
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Sat Oct 5 10:49:34 2013 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Sat Oct 5 10:49:59 2013 -0600

----------------------------------------------------------------------
 plugins/experimental/healthchecks/README        |  6 ++-
 .../experimental/healthchecks/healthchecks.c    | 39 +++++++++++---------
 2 files changed, 26 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/196cd66f/plugins/experimental/healthchecks/README
----------------------------------------------------------------------
diff --git a/plugins/experimental/healthchecks/README b/plugins/experimental/healthchecks/README
index ab156ac..e3e9791 100644
--- a/plugins/experimental/healthchecks/README
+++ b/plugins/experimental/healthchecks/README
@@ -14,4 +14,8 @@ Examples:
    /__hc  /var/run/ts-alive  text/plain 200  403
 
 
-The content of the file, if any, is sent as the body of the response.
+The content of the file, if any, is sent as the body of the response. The
+existence of the file is sufficient to get an "OK" status. Performance wise,
+everything is served out of memory, and it only stats / opens files as
+necessary. However, the content of the status file is limited to 16KB, so
+this is not a generic static file serving plugin.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/196cd66f/plugins/experimental/healthchecks/healthchecks.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/healthchecks/healthchecks.c b/plugins/experimental/healthchecks/healthchecks.c
index f8763d3..bb27505 100644
--- a/plugins/experimental/healthchecks/healthchecks.c
+++ b/plugins/experimental/healthchecks/healthchecks.c
@@ -65,8 +65,7 @@ typedef struct HCDirEntry_t
 /* Information about a status file. This is never modified (only replaced, see HCFileInfo_t)
*/
 typedef struct HCFileData_t
 {
-  time_t mtime;                   /* Last modified time of file */
-  int exists;                     /* Does this file exist ? */
+  int exists;                     /* Does this file exist */
   char body[MAX_BODY_LEN];        /* Body from fname. NULL means file is missing */
   int b_len;                      /* Length of data */
   time_t remove;                  /* Used for deciding when the old object can be permanently
removed */
@@ -78,7 +77,7 @@ typedef struct HCFileInfo_t
 {
   char fname[MAX_FILENAME_LEN];   /* Filename */
   char *basename;                 /* The "basename" of the file */
-  char path[MAX_PATH_LEN];        /* Path for this HC */
+  char path[MAX_PATH_LEN];        /* URL path for this HC */
   int p_len;                      /* Length of path */
   const char *ok;                 /* Header for an OK result */
   int o_len;                      /* Length of OK header */
@@ -123,10 +122,10 @@ reload_status_file(HCFileInfo *info, HCFileData *data)
     FILE *fd;
 
     if (NULL != (fd = fopen(info->fname, "r"))) {
-      if ((data->b_len = fread(data->body, 1, MAX_BODY_LEN, fd)) > 0) {
-        data->exists = 1;
-        data->mtime = buf.st_mtime;
-      }
+      data->exists = 1;
+      do {
+        data->b_len = fread(data->body, 1, MAX_BODY_LEN, fd);
+      } while (!feof(fd)); /*  Only save the last 16KB of the file ... */
       fclose(fd);
     }
   }
@@ -155,9 +154,12 @@ setup_watchers(int fd)
 
   while (conf) {
     conf->wd = inotify_add_watch(fd, conf->fname, IN_DELETE_SELF|IN_CLOSE_WRITE);
+    TSDebug(PLUGIN_NAME, "Setting up a watcher for %s", conf->fname);
     strncpy(fname, conf->fname, MAX_FILENAME_LEN - 1);
     dname = dirname(fname);
-    if (!(dir = find_direntry(dname, head_dir))) {     /* Make sure to only watch each directory
once */
+    /* Make sure to only watch each directory once */
+    if (!(dir = find_direntry(dname, head_dir))) {
+      TSDebug(PLUGIN_NAME, "Setting up a watcher for directory %s", dname);
       dir = TSmalloc(sizeof(HCDirEntry));
       memset(dir, 0, sizeof(HCDirEntry));
       strncpy(dir->dname, dname, MAX_FILENAME_LEN - 1);
@@ -195,7 +197,6 @@ hc_thread(void *data ATS_UNUSED)
 
   while (1) {
     HCFileData *fdata = fl_head, *fdata_prev = NULL;
-    int i = 0;
 
     /* Read the inotify events, blocking until we get something */
     len  = read(fd, buffer, INOTIFY_BUFLEN);
@@ -205,7 +206,7 @@ hc_thread(void *data ATS_UNUSED)
        are ordered "by time", so once we find one that is scheduled for deletion,
        we can also delete all entries after it in the linked list. */
     while (fdata) {
-      if (fdata->remove < now.tv_sec) {
+      if (now.tv_sec > fdata->remove) {
         /* Now drop off the "tail" from the freelist */
         if (fdata_prev)
           fdata_prev->_next = NULL;
@@ -227,18 +228,19 @@ hc_thread(void *data ATS_UNUSED)
     }
 
     if (len >= 0) {
+      int i = 0;
+
       while (i < len) {
         struct inotify_event *event = (struct inotify_event *)&buffer[i];
-        int wd = event->wd;
         HCFileInfo *finfo = g_config;
 
-        while (finfo) {
-          if ((wd == finfo->wd) || (wd == finfo->dir->wd && !strncmp(event->name,
finfo->basename, event->len)))
-            break;
+        while (finfo && !((event->wd == finfo->wd) ||
+                          ((event->wd == finfo->dir->wd) && !strncmp(event->name,
finfo->basename, event->len)))) {
           finfo = finfo->_next;
         }
         if (finfo) {
           HCFileData *new_data = TSmalloc(sizeof(HCFileData));
+          HCFileData *old_data;
 
           if (event->mask & (IN_CLOSE_WRITE)) {
             TSDebug(PLUGIN_NAME, "Modify file event (%d) on %s", event->mask, finfo->fname);
@@ -252,12 +254,13 @@ hc_thread(void *data ATS_UNUSED)
           /* Load the new data and then swap this atomically */
           memset(new_data, 0, sizeof(HCFileData));
           reload_status_file(finfo, new_data);
-          ink_atomic_swap_ptr(&(finfo->data), new_data);
+          TSDebug(PLUGIN_NAME, "Reloaded %s, len == %d, exists == %d", finfo->fname, new_data->b_len,
new_data->exists);
+          old_data = ink_atomic_swap_ptr(&(finfo->data), new_data);
 
           /* Add the old data to the head of the freelist */
-          new_data->remove = now.tv_sec + FREELIST_TIMEOUT;
-          new_data->_next = fl_head;
-          fl_head = new_data;
+          old_data->remove = now.tv_sec + FREELIST_TIMEOUT;
+          old_data->_next = fl_head;
+          fl_head = old_data;
         }
         i += sizeof(struct inotify_event) + event->len;
       }


Mime
View raw message