@@ -1,6 +1,8 @@

 1.1.4:

  - log format change. add [error] for error log

  - latency improvement.

+ - fix: terminate process when file close error.

+ -

 1.1.3:

  - sort msync --members by hostname

@@ -792,8 +792,9 @@ int linkcmp(mfile *m)

 int statcmp(struct stat *s1, struct stat *s2)

 {

-  if(s1->st_mtime != s2->st_mtime)

+  if(s1->st_mtime != s2->st_mtime){

     return(MAKUO_RECVSTATE_UPDATE);

+  }

   if(!geteuid() || !getegid()){

     if(s1->st_uid != s2->st_uid){

       return(MAKUO_RECVSTATE_UPDATE);

@@ -16,7 +16,7 @@ void recv_timeout(mfile *m)

     for(t=members;t;t=t->next){

       r = get_hoststate(t, m);

       if(*r == MAKUO_RECVSTATE_NONE){

-        lprintf(0, "%s: %s(%s)\n", __func__, inet_ntoa(t->ad), t->hostname);

+        lprintf(0, "[error] %s: %s(%s)\n", __func__, inet_ntoa(t->ad), t->hostname);

         member_del_message(t, "receive time out");

         member_del(t);

         break;

@@ -92,19 +92,17 @@ int mcomm_accept(mcomm *c, fd_set *fds, int s)

 }

 void mcomm_check(mcomm *c){

-  int i, j;

+  int    i;

   mfile *m;

   for(i=0;i<MAX_COMM;i++){

-    if(c[i].fd[1] == -1){

+    if(c[i].working && !c[i].cpid && (c[i].fd[1] == -1)){

       for(m=mftop[0];m;m=m->next){

         if(m->comm == &c[i]){

-          break;

+          break; /* working */

         }

       }

       if(!m){

-        if(c[i].working && !c[i].cpid){

-          workend(&c[i]);

-        }

+        workend(&c[i]);

       }

     }

   }

@@ -53,7 +53,7 @@

 #define MAKUO_MCAST_PORT  5000

 /*----- timeout -----*/

-#define MAKUO_SEND_TIMEOUT  501    /* 再送間隔(ms)                                 */

+#define MAKUO_SEND_TIMEOUT  500    /* 再送間隔(ms)                                 */

 #define MAKUO_SEND_RETRYCNT 120    /* 再送回数                                     */

 #define MAKUO_PONG_TIMEOUT  300000 /* メンバから除外するまでの時間(ms)             */

 #define MAKUO_PONG_INTERVAL 45000  /* PONG送信間隔(ms)                             */

@@ -547,10 +547,11 @@ static void mrecv_req_send_mark(mfile *m, mdata *r)

   m->lickflag = 1;

   a = mkack(&(m->mdata),&(m->addr),MAKUO_RECVSTATE_MARK);

   if(!a){

-    lprintf(0, "%s: out of momory\n", __func__);

+    lprintf(0, "[error] %s: out of momory\n", __func__);

     return;

   }

   if(a->mdata.head.szdata){

+    msend(a);

     return;

   }

   for(mm=m->mark;mm;mm=mm->next){

@@ -576,29 +577,33 @@ static void mrecv_req_send_data_write(mfile *m, mdata *r)

   if(r->head.szdata == 0){

     return;

   }

-  offset = r->head.seqno;

+  offset  = r->head.seqno;

   offset *= MAKUO_BUFFER_SIZE;

   if(lseek(m->fd, offset, SEEK_SET) == -1){

-    lprintf(0, "%s: seek error (%s) seq=%u\n",

-      __func__, strerror(errno), (int)(r->head.seqno));

+    m->mdata.head.error  = errno;

     m->mdata.head.ostate = m->mdata.head.nstate;

     m->mdata.head.nstate = MAKUO_RECVSTATE_WRITEERROR;

     mrecv_req_send_data_write_error(m, r);

-    return; /* seek error */

+    lprintf(0, "[error] %s: seek error (%s) seq=%u\n",

+      __func__,

+      strerror(m->mdata.head.error), 

+      (int)(r->head.seqno));

+    return; /* lseek error */

   }

-  if(write(m->fd, r->data, r->head.szdata) != -1){

-    m->recvcount++;

-  }else{

-    lprintf(0, "%s: write error (%s) seqno=%d size=%d %s\n",

+  if(write(m->fd, r->data, r->head.szdata) == -1){

+    m->mdata.head.error  = errno;

+    m->mdata.head.ostate = m->mdata.head.nstate;

+    m->mdata.head.nstate = MAKUO_RECVSTATE_WRITEERROR;

+    mrecv_req_send_data_write_error(m, r);

+    lprintf(0, "[error] %s: write error (%s) seqno=%d size=%d %s\n",

       __func__,

-      strerror(errno), 

+      strerror(m->mdata.head.error), 

       (int)(r->head.seqno), 

       r->head.szdata,

       m->fn);

-    m->mdata.head.ostate = m->mdata.head.nstate;

-    m->mdata.head.nstate = MAKUO_RECVSTATE_WRITEERROR;

-    mrecv_req_send_data_write_error(m, r);

+    return; /* write error */

   }

+  m->recvcount++;

 }

 static void mrecv_req_send_data_retry(mfile *m, mdata *r)

@@ -664,14 +669,16 @@ static void mrecv_req_send_close(mfile *m, mdata *r)

     return;

   }

+  m->mdata.head.ostate = m->mdata.head.nstate;

   if(m->mdata.head.nstate != MAKUO_RECVSTATE_OPEN){

+    m->mdata.head.nstate = MAKUO_RECVSTATE_CLOSE;

+    msend(mkack(&(m->mdata), &(m->addr), m->mdata.head.nstate));

     return;

   }

- 

+

   mftime.actime  = m->fs.st_ctime; 

   mftime.modtime = m->fs.st_mtime;

-  m->mdata.head.ostate = m->mdata.head.nstate;

-

+ 

   if(S_ISLNK(m->fs.st_mode)){

     if(!mrename(moption.base_dir, m->tn, m->fn)){

       m->mdata.head.nstate = MAKUO_RECVSTATE_CLOSE;

@@ -863,7 +870,6 @@ static mfile *mrecv_req_send_create(mdata *data, struct sockaddr_in *addr)

 static void mrecv_req_send(mdata *data, struct sockaddr_in *addr)

 {

   mfile *m;

-

   if(m = mrecv_req_send_create(data, addr)){

     mtimeget(&(m->lastrecv));

     mrecv_req_send_next(m, data);

@@ -1117,7 +1123,7 @@ static void mrecv_req_dsync_data(mfile *m, mdata *data, struct sockaddr_in *addr

   pipe(p);

   pid = fork();

   if(pid == -1){

-    lprintf(0, "%s: fork error (%s)\n", __func__, strerror(errno));

+    lprintf(0, "%s: %s fork error\n", __func__, strerror(errno));

     close(p[0]);

     close(p[1]);

     return;

@@ -129,6 +129,7 @@ static int msend_packet(int s, mdata *data, struct sockaddr_in *addr)

 /* retry */

 static int msend_retry(mfile *m)

 {

+  uint32_t w;

   uint8_t *r;

   mhost   *t;

@@ -141,7 +142,13 @@ static int msend_retry(mfile *m)

   }

   if(m->mdata.head.opcode == MAKUO_OP_DSYNC){

     if(m->mdata.head.nstate == MAKUO_SENDSTATE_CLOSE){

-      return(0);

+      m->retrycnt--;

+      w = (MAKUO_SEND_RETRYCNT - m->retrycnt) * MAKUO_SEND_TIMEOUT;

+      if(w < 15000){

+        return(0);

+      }else{

+        m->retrycnt = MAKUO_SEND_RETRYCNT;

+      }

     }

   }

   lprintf(2, "%s: send retry count=%02d rid=%06d op=%s state=%s %s\n", 

@@ -1112,7 +1119,6 @@ void msend(mfile *m)

     msend_req(moption.mcsocket, m); 

   }

 }

-

 void msend_clean()

 {

   mfile *m = mftop[0];

@@ -1,10 +1,10 @@

 Name:           makuosan

-Version:        1.0.0

+Version:        1.1.4

 Release:        1%{?dist}

 Summary:        Multicasts All-Kinds of Updating Operation for Servers on Administered Network

 Group:          System Environment/Daemons

-License:        BSD

+License:        GPL

 URL:            http://lab.klab.org/wiki/Makuosan

 Source0:        http://downloads.sourceforge.net/makuosan/%{name}-%{version}.tar.gz

 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

@@ -83,6 +83,7 @@ rm -rf %{buildroot}

 %changelog

+* Sat May 16 2009 Masanobu Yasui <yasui0906@gmail.com> - 1.1.4

+

 * Thu Nov  6 2008 Naoya Nakazawa <naoya.n@gmail.com> - 1.0.0

 - Initial version

-