Re: [sheepdog] [PATCH] sheep: don't print error message when connection is off

2014-03-11 Thread Bastian Scholz 

Hi,

maybe possible to include this one in
0.7-stable tree?

Cheers

Bastian

Am 2013-12-17 14:26, schrieb Liu Yuan:

...
Dec 17 19:04:27  ERROR [net 11088] do_read(220) connection is closed
(48 bytes left)
Dec 17 19:04:27  ERROR [net 11088] rx_work(684) failed to read a header
...

This is quit annoying since nothing wrong with it and sheep.log is 
flooded with

these messages.

Signed-off-by: Liu Yuan 
---
 lib/net.c   |2 +-
 sheep/request.c |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/net.c b/lib/net.c
index 9b0aa44..23c9e5d 100644
--- a/lib/net.c
+++ b/lib/net.c
@@ -217,7 +217,7 @@ int do_read(int sockfd, void *buf, int len, bool
(*need_retry)(uint32_t epoch),
 reread:
ret = read(sockfd, buf, len);
if (ret == 0) {
-   sd_err("connection is closed (%d bytes left)", len);
+   sd_debug("connection is closed (%d bytes left)", len);
return 1;
}
if (ret < 0) {
diff --git a/sheep/request.c b/sheep/request.c
index c542221..defffe8 100644
--- a/sheep/request.c
+++ b/sheep/request.c
@@ -681,7 +681,7 @@ static void rx_work(struct work *work)

ret = do_read(conn->fd, &hdr, sizeof(hdr), NULL, 0, UINT32_MAX);
if (ret) {
-   sd_err("failed to read a header");
+   sd_debug("failed to read a header");
conn->dead = true;
return;
}
--
1.7.9.5



--
sheepdog mailing list
sheepdog@lists.wpkg.org
http://lists.wpkg.org/mailman/listinfo/sheepdog

[sheepdog] [PATCH stable-0.7] sheep: don't print error message when connection is off

2014-03-11 Thread Hitoshi Mitake 
From: Liu Yuan 

...
Dec 17 19:04:27  ERROR [net 11088] do_read(220) connection is closed (48 bytes 
left)
Dec 17 19:04:27  ERROR [net 11088] rx_work(684) failed to read a header
...

This is quit annoying since nothing wrong with it and sheep.log is flooded with
these messages.

Signed-off-by: Liu Yuan 
---
 lib/net.c   | 2 +-
 sheep/request.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/net.c b/lib/net.c
index e38dfaa..b32e022 100644
--- a/lib/net.c
+++ b/lib/net.c
@@ -217,7 +217,7 @@ int do_read(int sockfd, void *buf, int len, bool 
(*need_retry)(uint32_t epoch),
 reread:
ret = read(sockfd, buf, len);
if (ret == 0) {
-   sd_err("connection is closed (%d bytes left)", len);
+   sd_debug("connection is closed (%d bytes left)", len);
return 1;
}
if (ret < 0) {
diff --git a/sheep/request.c b/sheep/request.c
index 39e0d9e..553b133 100644
--- a/sheep/request.c
+++ b/sheep/request.c
@@ -534,7 +534,7 @@ static void rx_work(struct work *work)
 
ret = do_read(conn->fd, &hdr, sizeof(hdr), NULL, 0, UINT32_MAX);
if (ret) {
-   sd_err("failed to read a header");
+   sd_debug("failed to read a header");
conn->dead = true;
return;
}
-- 
1.8.3.2

-- 
sheepdog mailing list
sheepdog@lists.wpkg.org
http://lists.wpkg.org/mailman/listinfo/sheepdog

[sheepdog] [PATCH stable-0.7] update for removing an annoying error message

2014-03-11 Thread Hitoshi Mitake 
Liu Yuan (1):
  sheep: don't print error message when connection is off

 lib/net.c   | 2 +-
 sheep/request.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
1.8.3.2

-- 
sheepdog mailing list
sheepdog@lists.wpkg.org
http://lists.wpkg.org/mailman/listinfo/sheepdog

Re: [sheepdog] [PATCH] sheep: don't print error message when connection is off

2014-03-11 Thread Hitoshi Mitake 
On Tue, Mar 11, 2014 at 5:51 PM, Bastian Scholz  wrote:
> Hi,
>
> maybe possible to include this one in
> 0.7-stable tree?

Backported the patch to stable-0.7 because as you say it makes sense.

Thanks,
Hitoshi

>
> Cheers
>
> Bastian
>
> Am 2013-12-17 14:26, schrieb Liu Yuan:
>
>> ...
>> Dec 17 19:04:27  ERROR [net 11088] do_read(220) connection is closed
>> (48 bytes left)
>> Dec 17 19:04:27  ERROR [net 11088] rx_work(684) failed to read a header
>> ...
>>
>> This is quit annoying since nothing wrong with it and sheep.log is flooded
>> with
>> these messages.
>>
>> Signed-off-by: Liu Yuan 
>> ---
>>  lib/net.c   |2 +-
>>  sheep/request.c |2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/lib/net.c b/lib/net.c
>> index 9b0aa44..23c9e5d 100644
>> --- a/lib/net.c
>> +++ b/lib/net.c
>> @@ -217,7 +217,7 @@ int do_read(int sockfd, void *buf, int len, bool
>> (*need_retry)(uint32_t epoch),
>>  reread:
>> ret = read(sockfd, buf, len);
>> if (ret == 0) {
>> -   sd_err("connection is closed (%d bytes left)", len);
>> +   sd_debug("connection is closed (%d bytes left)", len);
>> return 1;
>> }
>> if (ret < 0) {
>> diff --git a/sheep/request.c b/sheep/request.c
>> index c542221..defffe8 100644
>> --- a/sheep/request.c
>> +++ b/sheep/request.c
>> @@ -681,7 +681,7 @@ static void rx_work(struct work *work)
>>
>> ret = do_read(conn->fd, &hdr, sizeof(hdr), NULL, 0, UINT32_MAX);
>> if (ret) {
>> -   sd_err("failed to read a header");
>> +   sd_debug("failed to read a header");
>> conn->dead = true;
>> return;
>> }
>> --
>> 1.7.9.5
>
>
>
> --
> sheepdog mailing list
> sheepdog@lists.wpkg.org
> http://lists.wpkg.org/mailman/listinfo/sheepdog
-- 
sheepdog mailing list
sheepdog@lists.wpkg.org
http://lists.wpkg.org/mailman/listinfo/sheepdog

Re: [sheepdog] [PATCH stable-0.7] update for walkaround of build failure caused by ARG_MAX definition

2014-03-11 Thread Hitoshi Mitake 
At Tue, 11 Mar 2014 10:41:07 +0900,
Hitoshi Mitake wrote:
> 
> This update conatins manual modification. If no one disagrees in 2 days or a
> maintainer agrees, it will be pushed to stable-0.7.
> 
> Robin Dong (1):
>   lib: fix compiler error in logger.c
> 
>  lib/logger.c |8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)

Pushed to stable-0.7.

Thanks,
Hitoshi
-- 
sheepdog mailing list
sheepdog@lists.wpkg.org
http://lists.wpkg.org/mailman/listinfo/sheepdog