Changeset 88:c114fb579eb4

Timestamp:

11/18/09 15:16:12 (8 months ago)

Author:

roberto@…

Branch:

default

Message:

signal handling (SIGHUP,SIGTERM,SIGINT,SIGQUIT), and real graceful reload of master process

Files:

• utils.c (modified) (2 diffs)
• uwsgi.c (modified) (17 diffs)
• uwsgi.h (modified) (3 diffs)

utils.c

@@ +1 @@
+#include "uwsgi.h"
+
 #ifndef UNBIT
-
-#include "uwsgi.h"
 
 void daemonize(char *logfile) {
@@ -80 +80 @@
 
 #endif
+
+char * uwsgi_get_cwd() {
+
+        int newsize = 256 ;
+        char *cwd ;
+
+        cwd = malloc(newsize);
+        if (cwd == NULL) {
+                perror("malloc()");
+                exit(1);
+        }       
+
+        if (getcwd(cwd, newsize) == NULL) {
+                newsize = errno;
+                fprintf(stderr,"need a bigger buffer (%d bytes) for getcwd(). doing reallocation.\n", newsize);
+                free(cwd);
+                cwd = malloc(newsize);
+                if (cwd == NULL) {
+                        perror("malloc()");
+                        exit(1);
+                }               
+                if (getcwd(cwd, newsize) == NULL) {
+                        perror("getcwd()");
+                        exit(1);
+                }
+        }
+
+        return cwd;
+        
+}

uwsgi.c

@@ -144 +144 @@
 struct timeval start_of_uwsgi ;
 
+char *sharedarea ;
+
 #ifndef UNBIT
 #ifndef ROCK_SOLID
@@ -208 +210 @@
         }
         else {
-                goodbye_cruel_world() ;
-        }
+                reload_me();
+        }
+}
+
+void reload_me() {
+        exit(UWSGI_RELOAD_CODE);
+}
+
+void end_me() {
+        exit(UWSGI_END_CODE);
 }
 
@@ -219 +229 @@
 void kill_them_all() {
         int i ;
-        fprintf(stderr,"...killing workers...\n");
+        fprintf(stderr,"SIGINT/SIGQUIT received...killing workers...\n");
         for(i=1;i<=numproc;i++) {       
-                kill(workers[i], SIGKILL);
-        }
-        exit(0);
+                kill(workers[i], SIGINT);
+        }
 }
 
@@ -230 +239 @@
         fprintf(stderr,"...gracefully killing workers...\n");
         for(i=1;i<=numproc;i++) {       
-                kill(workers[i], SIGTERM);
+                kill(workers[i], SIGHUP);
         }
 }
@@ -238 +247 @@
         fprintf(stderr,"...brutally killing workers...\n");
         for(i=1;i<=numproc;i++) {
-                kill(workers[i], SIGKILL);
+                kill(workers[i], SIGTERM);
         }
 }
@@ -531 +540 @@
 #endif
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[], char *envp[]) {
 
         PyObject *wsgi_result, *wsgi_chunks, *wchunk;
@@ -550 +559 @@
 #endif
 
+        char *cwd ;
+        char *binary_path ;
+        int ready_to_reload = 0;
+        int ready_to_die = 0;
+        
+        int is_a_reload = 0 ;
+
         PyObject *pydictkey, *pydictvalue;
 
@@ -560 +576 @@
 
 
+        int socket_type; 
+        socklen_t socket_type_len; 
 
         gettimeofday(&start_of_uwsgi, NULL) ;
 
         setlinebuf(stdout);
+
+        cwd = uwsgi_get_cwd();
+        binary_path = malloc(strlen(argv[0])) ;
+        if (binary_path == NULL) {
+                perror("malloc()");
+                exit(1);
+        }
+        strcpy(binary_path, argv[0]);
+
+        if (!getsockopt(3, SOL_SOCKET, SO_TYPE, &socket_type, &socket_type_len)) {
+                fprintf(stderr, "...fd 3 is a socket, i suppose this is a graceful reload of uWSGI, i will try to do my best...\n");
+                is_a_reload = 1 ;
+#ifdef UNBIT
+                /* discard the 3'th fd as we will use the fd 0 */
+                close(3);
+#else
+                serverfd = 3;
+#endif
+        }
 
 #ifndef UNBIT
@@ -603 +640 @@
 #ifndef UNBIT
                         case 'd':
-                                daemonize(optarg);
+                                if (!is_a_reload) {
+                                        daemonize(optarg);
+                                }
                                 break;
                         case 's':
@@ -820 +859 @@
 
 #ifndef UNBIT
-        if (socket_name != NULL) {
+        if (socket_name != NULL && !is_a_reload) {
                 char *tcp_port = strchr(socket_name, ':');
                 if (tcp_port == NULL) {
@@ -903 +942 @@
         }
         else {
-                fprintf(stderr, "spawned uWSGI master process (pid: %d)\n", mypid);
+                if (is_a_reload) {
+                        fprintf(stderr, "gracefully (RE)spawned uWSGI master process (pid: %d)\n", mypid);
+                }
+                else {
+                        fprintf(stderr, "spawned uWSGI master process (pid: %d)\n", mypid);
+                }
                 workers = malloc(sizeof(pid_t)*numproc+1);
         }
@@ -928 +972 @@
                 if (pid == 0 ) {
                         mypid = getpid();
+                        if (serverfd != 0 && master_process == 1) {
+                                /* close STDIN for workers */
+                                close(0);
+                        }
                         break;
                 }
@@ -946 +994 @@
         if (getpid() == masterpid && master_process == 1) {
                 /* route signals to workers... */
-                signal(SIGTERM, (void *) &grace_them_all);
-                signal(SIGINT, (void *) &reap_them_all);
+                signal(SIGHUP, (void *) &grace_them_all);
+                signal(SIGTERM, (void *) &reap_them_all);
+                signal(SIGINT, (void *) &kill_them_all);
                 signal(SIGQUIT, (void *) &kill_them_all);
                 for(;;) {
+                        if (ready_to_die >= numproc) {
+                                fprintf(stderr,"goodbye to uWSGI.\n");
+                                exit(0);
+                        }               
+                        if (ready_to_reload >= numproc) {
+                                fprintf(stderr,"binary reloading uWSGI...\n");
+                                if (chdir(cwd)) {
+                                        perror("chdir()");
+                                        exit(1);
+                                }
+                                /* check fd table (a module can obviosly open some fd on initialization...) */
+                                fprintf(stderr,"closing all fds > 2 (_SC_OPEN_MAX = %ld)...\n",sysconf(_SC_OPEN_MAX));
+                                for(i=3;i<sysconf(_SC_OPEN_MAX);i++) {
+                                        if (i == serverfd) {
+                                                continue ;
+                                        }
+                                        close(i);
+                                }
+                                if (serverfd != 3) {
+                                        if (dup2(serverfd,3) < 0) {
+                                                perror("dup2()");
+                                                exit(1);
+                                        }
+                                }
+                                fprintf(stderr,"running %s\n", binary_path);
+                                strcpy(argv[0], binary_path);
+                                execve(binary_path, argv, envp);
+                                perror("execve()");
+                                exit(1);
+                        }
                         diedpid = waitpid(WAIT_ANY , &waitpid_status, 0) ;
                         if (diedpid == -1) {
@@ -957 +1036 @@
                                 exit(1);
                         }
+                        /* check for reloading */
+                        if (WIFEXITED(waitpid_status)) {
+                                if (WEXITSTATUS(waitpid_status) == UWSGI_RELOAD_CODE) {
+                                        ready_to_reload++;
+                                        continue;
+                                }
+                                else if (WEXITSTATUS(waitpid_status) == UWSGI_END_CODE) {
+                                        ready_to_die++;
+                                        continue;
+                                }
+                        }
                         fprintf(stderr,"DAMN ! process %d died :( trying respawn ...\n", diedpid);
                         gettimeofday(&last_respawn, NULL) ;
                         if (last_respawn.tv_sec == respawn_delta) {
                                 fprintf(stderr,"worker respawning too fast !!! i have to sleep a bit...\n");
+                                /* TODO, user configurable fork throttler */
                                 sleep(2);
                         }
@@ -1004 +1095 @@
         }
 
-        signal(SIGINT, (void *) &goodbye_cruel_world);
+        /* gracefully reload */
+        signal(SIGHUP, (void *) &gracefully_kill);
+        /* close the process (useful for master INT) */
+        signal(SIGINT, (void *) &end_me);
+        /* brutally reload */
+        signal(SIGTERM, (void *) &reload_me);
 
 
@@ -1012 +1108 @@
 #endif
 #endif
-
-        /* the best job for SIGTERM is to gracefully kill a process. */
-        signal(SIGTERM, (void *) &gracefully_kill);
 
         while(manage_next_request) {
@@ -1484 +1577 @@
         }
 
-        goodbye_cruel_world();
+        if (manage_next_request == 0) {
+                reload_me();
+        }
+        else {
+                goodbye_cruel_world();
+        }
 
         /* never here */

uwsgi.h

@@ -51 +51 @@
 
 #define PAGE_SIZE 4096
+
+#define UWSGI_RELOAD_CODE 17
+#define UWSGI_END_CODE 30
 
 
@@ -121 +124 @@
 
 
+char *uwsgi_get_cwd(void);
 
 void goodbye_cruel_world(void);
@@ -127 +131 @@
 void kill_them_all(void);
 void grace_them_all(void);
+void reload_me(void);
+void end_me(void);
 int bind_to_unix(char *, int,  int , int );
 int bind_to_tcp(char *, int , char *);