2:46 p.m.
[PATCH conductor] Redmine #752: Reconnect console if no qpid broker found.
This fixes the apparent error in connector log to the effect of:
warning Connect failed: Connection refused
warning Connection closed
<stacktrace>
This is not actually an error in connector, but a missing connect option
in the console. The way to test this is to stop qpidd service, then try
to start connector service. Watch the connector log for the above error.
Assuming you verified the error, apply patch, rebuild console and install
gem or rpm (I do gem, since I can force it to install over the old one).
Leaving qpidd stopped, attempt to start the connector again. Note that you
may do this manually w/o the service using:
./image_factory_connector -p 2003 start
Which will give you the output in STDOUT. You should now see the log above
minus the stacktrace. Let it try a few times, then start the qpidd service
in another window. After a few seconds, the connector should give some more
output showing it has connected, something like this:
$ ./image_factory_connector -p 2003 start
2011-03-23 15:17:06 warning Connect failed: Connection refused
2011-03-23 15:17:06 warning Connection closed
2011-03-23 15:17:09 warning Connect failed: Connection refused
2011-03-23 15:17:09 warning Connection closed
2011-03-23 15:17:15 warning Connect failed: Connection refused
2011-03-23 15:17:15 warning Connection closed
> Thin web server (v1.2.7 codename No Hup)
> Maximum connections set to 1024
> Listening on 0.0.0.0:2003, CTRL+C to stop
2:46 p.m.
New subject: [PATCH conductor] Redmine #752: Reconnect console if no qpid broker found.
---
.../lib/image_factory/image_factory_console.rb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/services/image_factory/console/lib/image_factory/image_factory_console.rb
b/services/image_factory/console/lib/image_factory/image_factory_console.rb
index 6408135..3ff0318 100644
--- a/services/image_factory/console/lib/image_factory/image_factory_console.rb
+++ b/services/image_factory/console/lib/image_factory/image_factory_console.rb
@@ -35,8 +35,8 @@ class ImageFactoryConsole < Qmf2::ConsoleHandler
port = args.include?(:port) ? args[:port] : 5672
# url = "amqp://#{host}:#{port}" <- the amqp part here doesnt work yet
url = "#{host}:#{port}"
- conn_options = args.include?(:retry_limit)?
"reconnect-limit:#{args[:retry_limit]}" : ""
- @connection = Cqpid::Connection.new(url, conn_options)
+ opts = {"reconnect"=>"true"}
+ @connection = Cqpid::Connection.new(url, opts)
@connection.open
@session = Qmf2::ConsoleSession.new(@connection)
@session.open
--
1.7.4
10:16 p.m.
On 03/23/2011 12:46 PM, Jason Guiditta wrote:
[PATCH conductor] Redmine #752: Reconnect console if no qpid broker
found.
This fixes the apparent error in connector log to the effect of:
warning Connect failed: Connection refused
warning Connection closed
<stacktrace>
This is not actually an error in connector, but a missing connect option
in the console. The way to test this is to stop qpidd service, then try
to start connector service. Watch the connector log for the above error.
Assuming you verified the error, apply patch, rebuild console and install
gem or rpm (I do gem, since I can force it to install over the old one).
Leaving qpidd stopped, attempt to start the connector again. Note that you
may do this manually w/o the service using:
./image_factory_connector -p 2003 start
Which will give you the output in STDOUT. You should now see the log above
minus the stacktrace. Let it try a few times, then start the qpidd service
in another window. After a few seconds, the connector should give some more
output showing it has connected, something like this:
$ ./image_factory_connector -p 2003 start
2011-03-23 15:17:06 warning Connect failed: Connection refused
2011-03-23 15:17:06 warning Connection closed
2011-03-23 15:17:09 warning Connect failed: Connection refused
2011-03-23 15:17:09 warning Connection closed
2011-03-23 15:17:15 warning Connect failed: Connection refused
2011-03-23 15:17:15 warning Connection closed
>> Thin web server (v1.2.7 codename No Hup)
>> Maximum connections set to 1024
>> Listening on 0.0.0.0:2003, CTRL+C to stop
_______________________________________________
aeolus-devel mailing list
aeolus-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/aeolus-devel
I rebuilt and installed the
gem and started up image_factory_console
manually. The reconnection appears to be working, but the message
showing it has connected back to the broker doesn't appear. It appeared
once after I stopped qpidd. But subsequent qpidd restarts only stopped
the connection refused message until the next qpidd start:
[rwsu@kiwi aeolus-conductor]$ image_factory_connector -p 2003 start
2011-03-24 20:09:29 warning Connection [48459 localhost:5672] closed
2011-03-24 20:09:29 warning Connect failed: Connection refused
2011-03-24 20:09:29 warning Connection closed
2011-03-24 20:09:29 warning Connect failed: Connection refused
2011-03-24 20:09:29 warning Connection closed
2011-03-24 20:09:29 warning Connect failed: Connection refused
2011-03-24 20:09:29 warning Connection closed
2011-03-24 20:09:29 warning Connect failed: Connection refused
2011-03-24 20:09:29 warning Connection closed
*** restarted qpidd 1st time ***
> Thin web server (v1.2.5 codename This Is Not A Web Server)
> Maximum connections set to 1024
> Listening on 0.0.0.0:2003, CTRL+C to stop
2011-03-24 20:09:32 warning Connect
failed: Connection refused
2011-03-24 20:09:32 warning Connection closed
2011-03-24 20:09:32 warning Connect failed: Connection refused
2011-03-24 20:09:32 warning Connection closed
2011-03-24 20:09:32 warning Connect failed: Connection refused
2011-03-24 20:09:32 warning Connection closed
2011-03-24 20:09:32 warning Connect failed: Connection refused
2011-03-24 20:09:32 warning Connection closed
2011-03-24 20:09:38 warning Connect failed: Connection refused
2011-03-24 20:09:38 warning Connection closed
2011-03-24 20:09:38 warning Connect failed: Connection refused
2011-03-24 20:09:38 warning Connection closed
2011-03-24 20:09:38 warning Connect failed: Connection refused
2011-03-24 20:09:38 warning Connection closed
2011-03-24 20:09:38 warning Connect failed: Connection refused
2011-03-24 20:09:38 warning Connection closed
*** started qpidd ***
*** stopped qpidd ***
2011-03-24 20:10:07 warning Connection [48546 localhost:5672] closed
2011-03-24 20:10:07 warning Connection [48547 localhost:5672] closed
2011-03-24 20:10:07 warning Connect failed: Connection refused
2011-03-24 20:10:07 warning Connection closed
2011-03-24 20:10:07 warning Connect failed: Connection refused
2011-03-24 20:10:07 warning Connection closed
2011-03-24 20:10:07 warning Connect failed: Connection refused
2011-03-24 20:10:07 warning Connection closed
2011-03-24 20:10:10 warning Connect failed: Connection refused
2011-03-24 20:10:10 warning Connection closed
2011-03-24 20:10:10 warning Connect failed: Connection refused
2011-03-24 20:10:10 warning Connection closed
2011-03-24 20:10:10 warning Connect failed: Connection refused
2011-03-24 20:10:10 warning Connection closed
2011-03-24 20:10:10 warning Connect failed: Connection refused
2011-03-24 20:10:10 warning Connection closed
2011-03-24 20:10:16 warning Connect failed: Connection refused
2011-03-24 20:10:16 warning Connection closed
2011-03-24 20:10:16 warning Connect failed: Connection refused
2011-03-24 20:10:16 warning Connection closed
2011-03-24 20:10:16 warning Connect failed: Connection refused
2011-03-24 20:10:16 warning Connection closed
2011-03-24 20:10:16 warning Connect failed: Connection refused
2011-03-24 20:10:16 warning Connection closed
*** started qpidd ***
*** stopped qpidd ***
2011-03-24 20:11:14 warning Connection [48563 localhost:5672] closed
2011-03-24 20:11:14 warning Connect failed: Connection refused
2011-03-24 20:11:14 warning Connection closed
2011-03-24 20:11:14 warning Connect failed: Connection refused
2011-03-24 20:11:14 warning Connection closed
2011-03-24 20:11:14 warning Connect failed: Connection refused
2011-03-24 20:11:14 warning Connection closed
2011-03-24 20:11:14 warning Connect failed: Connection refused
2011-03-24 20:11:14 warning Connection closed
2011-03-24 20:11:17 warning Connect failed: Connection refused
2011-03-24 20:11:17 warning Connection closed
2011-03-24 20:11:17 warning Connect failed: Connection refused
2011-03-24 20:11:17 warning Connection closed
2011-03-24 20:11:17 warning Connect failed: Connection refused
2011-03-24 20:11:17 warning Connection closed
2011-03-24 20:11:17 warning Connect failed: Connection refused
2011-03-24 20:11:17 warning Connection closed
2011-03-24 20:11:23 warning Connect failed: Connection refused
2011-03-24 20:11:23 warning Connection closed
2011-03-24 20:11:23 warning Connect failed: Connection refused
2011-03-24 20:11:23 warning Connection closed
2011-03-24 20:11:23 warning Connect failed: Connection refused
2011-03-24 20:11:23 warning Connection closed
2011-03-24 20:11:23 warning Connect failed: Connection refused
2011-03-24 20:11:23 warning Connection closed
^C>> Stopping ...
4:38 p.m.
On Thu, 2011-03-24 at 20:16 -0700, Richard Su wrote:
On 03/23/2011 12:46 PM, Jason Guiditta wrote:
> [PATCH conductor] Redmine #752: Reconnect console if no qpid broker found.
>
> This fixes the apparent error in connector log to the effect of:
> warning Connect failed: Connection refused
> warning Connection closed
> <stacktrace>
>
> This is not actually an error in connector, but a missing connect option
> in the console. The way to test this is to stop qpidd service, then try
> to start connector service. Watch the connector log for the above error.
>
> Assuming you verified the error, apply patch, rebuild console and install
> gem or rpm (I do gem, since I can force it to install over the old one).
> Leaving qpidd stopped, attempt to start the connector again. Note that you
> may do this manually w/o the service using:
> ./image_factory_connector -p 2003 start
>
> Which will give you the output in STDOUT. You should now see the log above
> minus the stacktrace. Let it try a few times, then start the qpidd service
> in another window. After a few seconds, the connector should give some more
> output showing it has connected, something like this:
> $ ./image_factory_connector -p 2003 start
> 2011-03-23 15:17:06 warning Connect failed: Connection refused
> 2011-03-23 15:17:06 warning Connection closed
> 2011-03-23 15:17:09 warning Connect failed: Connection refused
> 2011-03-23 15:17:09 warning Connection closed
> 2011-03-23 15:17:15 warning Connect failed: Connection refused
> 2011-03-23 15:17:15 warning Connection closed
>>> Thin web server (v1.2.7 codename No Hup)
>>> Maximum connections set to 1024
>>> Listening on 0.0.0.0:2003, CTRL+C to stop
> _______________________________________________
> aeolus-devel mailing list
> aeolus-devel(a)lists.fedorahosted.org
> https://fedorahosted.org/mailman/listinfo/aeolus-devel
I rebuilt and installed the gem and started up image_factory_console
manually. The reconnection appears to be working, but the message
showing it has connected back to the broker doesn't appear. It appeared
once after I stopped qpidd. But subsequent qpidd restarts only stopped
the connection refused message until the next qpidd start:
Richard, just saw your reply, and am a little confused, is this an ACK?
The logs you posted appear to be working as desired, there is no message
expected on reconnect, but the 'Connection refused' stuff should stop,
with is appears to do if I am reading your output correctly. Can you
clarify for me?
-j
[rwsu@kiwi aeolus-conductor]$ image_factory_connector -p 2003 start
2011-03-24 20:09:29 warning Connection [48459 localhost:5672] closed
2011-03-24 20:09:29 warning Connect failed: Connection refused
2011-03-24 20:09:29 warning Connection closed
2011-03-24 20:09:29 warning Connect failed: Connection refused
2011-03-24 20:09:29 warning Connection closed
2011-03-24 20:09:29 warning Connect failed: Connection refused
2011-03-24 20:09:29 warning Connection closed
2011-03-24 20:09:29 warning Connect failed: Connection refused
2011-03-24 20:09:29 warning Connection closed
*** restarted qpidd 1st time ***
>> Thin web server (v1.2.5 codename This Is Not A Web Server)
>> Maximum connections set to 1024
>> Listening on 0.0.0.0:2003, CTRL+C to stop
2011-03-24 20:09:32 warning Connect failed: Connection refused
2011-03-24 20:09:32 warning Connection closed
2011-03-24 20:09:32 warning Connect failed: Connection refused
2011-03-24 20:09:32 warning Connection closed
2011-03-24 20:09:32 warning Connect failed: Connection refused
2011-03-24 20:09:32 warning Connection closed
2011-03-24 20:09:32 warning Connect failed: Connection refused
2011-03-24 20:09:32 warning Connection closed
2011-03-24 20:09:38 warning Connect failed: Connection refused
2011-03-24 20:09:38 warning Connection closed
2011-03-24 20:09:38 warning Connect failed: Connection refused
2011-03-24 20:09:38 warning Connection closed
2011-03-24 20:09:38 warning Connect failed: Connection refused
2011-03-24 20:09:38 warning Connection closed
2011-03-24 20:09:38 warning Connect failed: Connection refused
2011-03-24 20:09:38 warning Connection closed
*** started qpidd ***
*** stopped qpidd ***
2011-03-24 20:10:07 warning Connection [48546 localhost:5672] closed
2011-03-24 20:10:07 warning Connection [48547 localhost:5672] closed
2011-03-24 20:10:07 warning Connect failed: Connection refused
2011-03-24 20:10:07 warning Connection closed
2011-03-24 20:10:07 warning Connect failed: Connection refused
2011-03-24 20:10:07 warning Connection closed
2011-03-24 20:10:07 warning Connect failed: Connection refused
2011-03-24 20:10:07 warning Connection closed
2011-03-24 20:10:10 warning Connect failed: Connection refused
2011-03-24 20:10:10 warning Connection closed
2011-03-24 20:10:10 warning Connect failed: Connection refused
2011-03-24 20:10:10 warning Connection closed
2011-03-24 20:10:10 warning Connect failed: Connection refused
2011-03-24 20:10:10 warning Connection closed
2011-03-24 20:10:10 warning Connect failed: Connection refused
2011-03-24 20:10:10 warning Connection closed
2011-03-24 20:10:16 warning Connect failed: Connection refused
2011-03-24 20:10:16 warning Connection closed
2011-03-24 20:10:16 warning Connect failed: Connection refused
2011-03-24 20:10:16 warning Connection closed
2011-03-24 20:10:16 warning Connect failed: Connection refused
2011-03-24 20:10:16 warning Connection closed
2011-03-24 20:10:16 warning Connect failed: Connection refused
2011-03-24 20:10:16 warning Connection closed
*** started qpidd ***
*** stopped qpidd ***
2011-03-24 20:11:14 warning Connection [48563 localhost:5672] closed
2011-03-24 20:11:14 warning Connect failed: Connection refused
2011-03-24 20:11:14 warning Connection closed
2011-03-24 20:11:14 warning Connect failed: Connection refused
2011-03-24 20:11:14 warning Connection closed
2011-03-24 20:11:14 warning Connect failed: Connection refused
2011-03-24 20:11:14 warning Connection closed
2011-03-24 20:11:14 warning Connect failed: Connection refused
2011-03-24 20:11:14 warning Connection closed
2011-03-24 20:11:17 warning Connect failed: Connection refused
2011-03-24 20:11:17 warning Connection closed
2011-03-24 20:11:17 warning Connect failed: Connection refused
2011-03-24 20:11:17 warning Connection closed
2011-03-24 20:11:17 warning Connect failed: Connection refused
2011-03-24 20:11:17 warning Connection closed
2011-03-24 20:11:17 warning Connect failed: Connection refused
2011-03-24 20:11:17 warning Connection closed
2011-03-24 20:11:23 warning Connect failed: Connection refused
2011-03-24 20:11:23 warning Connection closed
2011-03-24 20:11:23 warning Connect failed: Connection refused
2011-03-24 20:11:23 warning Connection closed
2011-03-24 20:11:23 warning Connect failed: Connection refused
2011-03-24 20:11:23 warning Connection closed
2011-03-24 20:11:23 warning Connect failed: Connection refused
2011-03-24 20:11:23 warning Connection closed
^C>> Stopping ...
_______________________________________________
aeolus-devel mailing list
aeolus-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/aeolus-devel
4:59 p.m.
On 03/28/2011 02:38 PM, Jason Guiditta wrote:
On Thu, 2011-03-24 at 20:16 -0700, Richard Su wrote:
> On 03/23/2011 12:46 PM, Jason Guiditta wrote:
>> [PATCH conductor] Redmine #752: Reconnect console if no qpid broker found.
>>
>> This fixes the apparent error in connector log to the effect of:
>> warning Connect failed: Connection refused
>> warning Connection closed
>> <stacktrace>
>>
>> This is not actually an error in connector, but a missing connect option
>> in the console. The way to test this is to stop qpidd service, then try
>> to start connector service. Watch the connector log for the above error.
>>
>> Assuming you verified the error, apply patch, rebuild console and install
>> gem or rpm (I do gem, since I can force it to install over the old one).
>> Leaving qpidd stopped, attempt to start the connector again. Note that you
>> may do this manually w/o the service using:
>> ./image_factory_connector -p 2003 start
>>
>> Which will give you the output in STDOUT. You should now see the log above
>> minus the stacktrace. Let it try a few times, then start the qpidd service
>> in another window. After a few seconds, the connector should give some more
>> output showing it has connected, something like this:
>> $ ./image_factory_connector -p 2003 start
>> 2011-03-23 15:17:06 warning Connect failed: Connection refused
>> 2011-03-23 15:17:06 warning Connection closed
>> 2011-03-23 15:17:09 warning Connect failed: Connection refused
>> 2011-03-23 15:17:09 warning Connection closed
>> 2011-03-23 15:17:15 warning Connect failed: Connection refused
>> 2011-03-23 15:17:15 warning Connection closed
>>>> Thin web server (v1.2.7 codename No Hup)
>>>> Maximum connections set to 1024
>>>> Listening on 0.0.0.0:2003, CTRL+C to stop
>> _______________________________________________
>> aeolus-devel mailing list
>> aeolus-devel(a)lists.fedorahosted.org
>> https://fedorahosted.org/mailman/listinfo/aeolus-devel
> I rebuilt and installed the gem and started up image_factory_console
> manually. The reconnection appears to be working, but the message
> showing it has connected back to the broker doesn't appear. It appeared
> once after I stopped qpidd. But subsequent qpidd restarts only stopped
> the connection refused message until the next qpidd start:
>
Richard, just saw your reply, and am a little confused, is this an ACK?
The logs you posted appear to be working as desired, there is no message
expected on reconnect, but the 'Connection refused' stuff should stop,
with is appears to do if I am reading your output correctly. Can you
clarify for me?
-j
> [rwsu@kiwi aeolus-conductor]$ image_factory_connector -p 2003 start
> 2011-03-24 20:09:29 warning Connection [48459 localhost:5672] closed
> 2011-03-24 20:09:29 warning Connect failed: Connection refused
> 2011-03-24 20:09:29 warning Connection closed
> 2011-03-24 20:09:29 warning Connect failed: Connection refused
> 2011-03-24 20:09:29 warning Connection closed
> 2011-03-24 20:09:29 warning Connect failed: Connection refused
> 2011-03-24 20:09:29 warning Connection closed
> 2011-03-24 20:09:29 warning Connect failed: Connection refused
> 2011-03-24 20:09:29 warning Connection closed
> *** restarted qpidd 1st time ***
> >> Thin web server (v1.2.5 codename This Is Not A Web Server)
> >> Maximum connections set to 1024
> >> Listening on 0.0.0.0:2003, CTRL+C to stop
> 2011-03-24 20:09:32 warning Connect failed: Connection refused
> 2011-03-24 20:09:32 warning Connection closed
> 2011-03-24 20:09:32 warning Connect failed: Connection refused
> 2011-03-24 20:09:32 warning Connection closed
> 2011-03-24 20:09:32 warning Connect failed: Connection refused
> 2011-03-24 20:09:32 warning Connection closed
> 2011-03-24 20:09:32 warning Connect failed: Connection refused
> 2011-03-24 20:09:32 warning Connection closed
> 2011-03-24 20:09:38 warning Connect failed: Connection refused
> 2011-03-24 20:09:38 warning Connection closed
> 2011-03-24 20:09:38 warning Connect failed: Connection refused
> 2011-03-24 20:09:38 warning Connection closed
> 2011-03-24 20:09:38 warning Connect failed: Connection refused
> 2011-03-24 20:09:38 warning Connection closed
> 2011-03-24 20:09:38 warning Connect failed: Connection refused
> 2011-03-24 20:09:38 warning Connection closed
> *** started qpidd ***
> *** stopped qpidd ***
> 2011-03-24 20:10:07 warning Connection [48546 localhost:5672] closed
> 2011-03-24 20:10:07 warning Connection [48547 localhost:5672] closed
> 2011-03-24 20:10:07 warning Connect failed: Connection refused
> 2011-03-24 20:10:07 warning Connection closed
> 2011-03-24 20:10:07 warning Connect failed: Connection refused
> 2011-03-24 20:10:07 warning Connection closed
> 2011-03-24 20:10:07 warning Connect failed: Connection refused
> 2011-03-24 20:10:07 warning Connection closed
> 2011-03-24 20:10:10 warning Connect failed: Connection refused
> 2011-03-24 20:10:10 warning Connection closed
> 2011-03-24 20:10:10 warning Connect failed: Connection refused
> 2011-03-24 20:10:10 warning Connection closed
> 2011-03-24 20:10:10 warning Connect failed: Connection refused
> 2011-03-24 20:10:10 warning Connection closed
> 2011-03-24 20:10:10 warning Connect failed: Connection refused
> 2011-03-24 20:10:10 warning Connection closed
> 2011-03-24 20:10:16 warning Connect failed: Connection refused
> 2011-03-24 20:10:16 warning Connection closed
> 2011-03-24 20:10:16 warning Connect failed: Connection refused
> 2011-03-24 20:10:16 warning Connection closed
> 2011-03-24 20:10:16 warning Connect failed: Connection refused
> 2011-03-24 20:10:16 warning Connection closed
> 2011-03-24 20:10:16 warning Connect failed: Connection refused
> 2011-03-24 20:10:16 warning Connection closed
> *** started qpidd ***
> *** stopped qpidd ***
> 2011-03-24 20:11:14 warning Connection [48563 localhost:5672] closed
> 2011-03-24 20:11:14 warning Connect failed: Connection refused
> 2011-03-24 20:11:14 warning Connection closed
> 2011-03-24 20:11:14 warning Connect failed: Connection refused
> 2011-03-24 20:11:14 warning Connection closed
> 2011-03-24 20:11:14 warning Connect failed: Connection refused
> 2011-03-24 20:11:14 warning Connection closed
> 2011-03-24 20:11:14 warning Connect failed: Connection refused
> 2011-03-24 20:11:14 warning Connection closed
> 2011-03-24 20:11:17 warning Connect failed: Connection refused
> 2011-03-24 20:11:17 warning Connection closed
> 2011-03-24 20:11:17 warning Connect failed: Connection refused
> 2011-03-24 20:11:17 warning Connection closed
> 2011-03-24 20:11:17 warning Connect failed: Connection refused
> 2011-03-24 20:11:17 warning Connection closed
> 2011-03-24 20:11:17 warning Connect failed: Connection refused
> 2011-03-24 20:11:17 warning Connection closed
> 2011-03-24 20:11:23 warning Connect failed: Connection refused
> 2011-03-24 20:11:23 warning Connection closed
> 2011-03-24 20:11:23 warning Connect failed: Connection refused
> 2011-03-24 20:11:23 warning Connection closed
> 2011-03-24 20:11:23 warning Connect failed: Connection refused
> 2011-03-24 20:11:23 warning Connection closed
> 2011-03-24 20:11:23 warning Connect failed: Connection refused
> 2011-03-24 20:11:23 warning Connection closed
> ^C>> Stopping ...
>
> _______________________________________________
> aeolus-devel mailing list
> aeolus-devel(a)lists.fedorahosted.org
> https://fedorahosted.org/mailman/listinfo/aeolus-devel
I must have read it wrong. In your original email I thought that after a
reconnect, we should see something like "Listening on.." logged. The
lack of logging after a reconnect was the only "issue" I found. If
logging isn't expected, then it is fine and acked.
9:08 a.m.
On Mon, 2011-03-28 at 14:59 -0700, Richard Su wrote:
On 03/28/2011 02:38 PM, Jason Guiditta wrote:
> On Thu, 2011-03-24 at 20:16 -0700, Richard Su wrote:
>>
I must have read it wrong. In your original email I thought that after a
reconnect, we should see something like "Listening on.." logged. The
lack of logging after a reconnect was the only "issue" I found. If
logging isn't expected, then it is fine and acked.
Thanks Richard, this is now pushed.
-j
4:34 p.m.
New subject: [PATCH conductor 1/2] Redmine #754: Fix handling of agent_deleted event.
We were removing the agent in cases where we should not have been,
like if we had gotten a new agent, and then the old one finally aged
out of the filter. This corrects that, which shoudl make for far
fewer cases where there is no agent present.
---
.../lib/image_factory/image_factory_console.rb | 4 +-
.../console/spec/image_factory/console_spec.rb | 28 ++++++++++++++++++++
.../image_factory_connector.rb | 2 +-
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/services/image_factory/console/lib/image_factory/image_factory_console.rb
b/services/image_factory/console/lib/image_factory/image_factory_console.rb
index 3ff0318..a1a5b8c 100644
--- a/services/image_factory/console/lib/image_factory/image_factory_console.rb
+++ b/services/image_factory/console/lib/image_factory/image_factory_console.rb
@@ -49,7 +49,7 @@ class ImageFactoryConsole < Qmf2::ConsoleHandler
@logger.level = Logger::ERROR
@logger.datetime_format = "%Y-%m-%d %H:%M:%S"
end
- @handler = args.include?(:handler)? args[:handler]: BaseHandler.new
+ @handler = args.include?(:handler)? args[:handler]: BaseHandler.new(@logger)
super(@session)
end
@@ -93,7 +93,7 @@ class ImageFactoryConsole < Qmf2::ConsoleHandler
def agent_deleted(agent, reason)
@logger.debug "AGENT GONE: #{agent} at #{Time.now.utc}, because
#{reason}"
unless @q==nil
- @q = {} if @q.product == agent.product
+ @q = nil if (@q.product == agent.product && @q.name.eql?(agent.name))
end
end
diff --git a/services/image_factory/console/spec/image_factory/console_spec.rb
b/services/image_factory/console/spec/image_factory/console_spec.rb
index c7d5a69..4e3a0b1 100644
--- a/services/image_factory/console/spec/image_factory/console_spec.rb
+++ b/services/image_factory/console/spec/image_factory/console_spec.rb
@@ -46,6 +46,7 @@ module ImageFactory
before(:each) do
@agent = mock('agent', :null_object => true)
@agent.stub(:product).and_return("imagefactory")
+
@agent.stub(:name).and_return("redhat.com:imagefactory:b9e131c7-7905-409e-bfb5-dd4848a776a7")
@output = double('output')
@i2 = ImageFactoryConsole.new(:logger => @output)
end
@@ -63,6 +64,33 @@ module ImageFactory
end
end
+ describe "#agent_deleted" do
+ before(:each) do
+ @old_agent = mock('agent', :null_object => true)
+ @old_agent.stub(:product).and_return("imagefactory")
+
@old_agent.stub(:name).and_return("redhat.com:imagefactory:4eb3776e-d91e-4239-9a73-3ab43ecc7e15")
+ @output.should_receive(:debug).with(/GOT AN AGENT/)
+ @i2.agent_added(@agent)
+ end
+
+ it "logs when an agent is removed" do
+ @output.should_receive(:debug).with(/AGENT GONE/).as_null_object
+ @i2.agent_deleted(@agent, "aged")
+ end
+
+ it "removes the agent reference if removed agent is the same as console
reference" do
+ @output.should_receive(:debug).with(/AGENT GONE/).as_null_object
+ @i2.agent_deleted(@agent, "aged")
+ @i2.q.should be_nil
+ end
+
+ it "does not remove the agent reference if removed agent is the not same as
console reference" do
+ @output.should_receive(:debug).with(/AGENT GONE/).as_null_object
+ @i2.agent_deleted(@old_agent, "aged")
+ @i2.q.should_not be_nil
+ end
+ end
+
describe "#event_raised" do
before(:each) do
@data = mock('data', :null_object => true)
diff --git
a/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
b/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
index 98a7a32..6338c09 100644
---
a/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
+++
b/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
@@ -31,7 +31,7 @@ class ImageFactoryConnector < Sinatra::Base
set :views, File.dirname(__FILE__) + '/views'
l = Logger.new(STDOUT)
l.level = Logger::DEBUG
- @console = ImageFactoryConsole.new({:handler=>FactoryRestHandler.new(l)})
+ @console = ImageFactoryConsole.new({:handler=>FactoryRestHandler.new(l), :logger
=>l})
@console.start
set :console, @console
end
--
1.7.4
4:34 p.m.
New subject: [PATCH conductor 2/2] Improve Error handling when there is no agent present.
Previously, the connector would throw a stack trace and stop
working properly if the factory agent was gone and a user
attempted an action, this patch adds logging and catches
this type of exceptionm as well as returning a 500 server error
to the caller, to be handled as desired. Future rev will return
the error string as well, but Conductor does nothing with errors
at this point anyway.
---
.../lib/image_factory/image_factory_console.rb | 20 +++++++++---
.../console/spec/image_factory/console_spec.rb | 25 ++++++++++++----
.../image_factory_connector.rb | 25 +++++++++++----
.../image_factory_connector/spec/connector_spec.rb | 32 +++++++++++++++++--
4 files changed, 80 insertions(+), 22 deletions(-)
diff --git a/services/image_factory/console/lib/image_factory/image_factory_console.rb
b/services/image_factory/console/lib/image_factory/image_factory_console.rb
index a1a5b8c..c196632 100644
--- a/services/image_factory/console/lib/image_factory/image_factory_console.rb
+++ b/services/image_factory/console/lib/image_factory/image_factory_console.rb
@@ -64,8 +64,13 @@ class ImageFactoryConsole < Qmf2::ConsoleHandler
def build_image(descriptor, target)
# TODO: return error if there is a problem calling this method or getting
# a factory instance
- response = factory.image(descriptor, target)
- build_adaptor(response)
+ begin
+ response = factory.image(descriptor, target)
+ build_adaptor(response)
+ rescue Exception => e
+ @logger.debug "Encountered error in build_image: #{e}"
+ return e
+ end
end
# Call this method to push an image to a provider, and get back an
@@ -80,8 +85,13 @@ class ImageFactoryConsole < Qmf2::ConsoleHandler
def push_image(image_id, provider, credentials)
# TODO: return error if there is a problem calling this method or getting
# a factory instance
- response = factory.provider_image(image_id, provider, credentials)
- build_adaptor(response)
+ begin
+ response = factory.provider_image(image_id, provider, credentials)
+ build_adaptor(response)
+ rescue Exception => e
+ @logger.debug "Encountered error in push_image: #{e}"
+ return e
+ end
end
#TODO: enhance both of these methods to handle multiple agents
@@ -132,7 +142,7 @@ class ImageFactoryConsole < Qmf2::ConsoleHandler
def build_adaptor(response)
imgfacaddr = Qmf2::DataAddr.new(response['build_adaptor'])
query = Qmf2::Query.new(imgfacaddr)
- @q.query(query).first
+ @q.query(query,5).first
end
end
diff --git a/services/image_factory/console/spec/image_factory/console_spec.rb
b/services/image_factory/console/spec/image_factory/console_spec.rb
index 4e3a0b1..9cd766d 100644
--- a/services/image_factory/console/spec/image_factory/console_spec.rb
+++ b/services/image_factory/console/spec/image_factory/console_spec.rb
@@ -8,7 +8,7 @@ module ImageFactory
@logger = Logger.new(STDOUT)
@logger.level = Logger::DEBUG
@logger.datetime_format = "%Y-%m-%d %H:%M:%S"
- @i = ImageFactoryConsole.new()
+ @i = ImageFactoryConsole.new() # Pass this in for more logging: (:logger =>
@logger)
@i.start
# Sadly, this is needed so we wait for an agent to appear.
# We might be able to extract this somewhere to hold off
@@ -97,11 +97,6 @@ module ImageFactory
@data.stub(:event).and_return("STATUS")
end
- it "should log an event" do
- @output.should_receive(:debug).with(/GOT AN EVENT/)
- @i2.event_raised(@agent, @data, Time.now, "horrid")
- end
-
it "should call handle on an event" do
@output.should_receive(:debug).with(/GOT AN EVENT/)
@@ -110,6 +105,24 @@ module ImageFactory
end
end
+ describe "#build_image" do
+ it "should gracefully handle errors" do
+ @output.should_receive(:debug).with(/Encountered error in build_image/)
+ @i2.q=nil
+ error = @i2.build_image("<template></template>",
"mock")
+ error.to_s.should include("undefined method")
+ end
+ end
+
+ describe "#push_image" do
+ it "should gracefully handle errors" do
+ @output.should_receive(:debug).with(/Encountered error in push_image/)
+ @i2.q=nil
+ error = @i2.push_image(123, "mock", "some creds")
+ error.to_s.should include("undefined method")
+ end
+ end
+
after(:each) do
@output.should_receive(:debug).with(/Closing/)
@i2.shutdown
diff --git
a/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
b/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
index 6338c09..e438dfe 100644
---
a/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
+++
b/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
@@ -29,11 +29,12 @@ class ImageFactoryConnector < Sinatra::Base
set :port, 2003
set :app_file, __FILE__
set :views, File.dirname(__FILE__) + '/views'
- l = Logger.new(STDOUT)
- l.level = Logger::DEBUG
- @console = ImageFactoryConsole.new({:handler=>FactoryRestHandler.new(l), :logger
=>l})
+ @l = Logger.new(STDOUT)
+ @l.level = Logger::DEBUG
+ @console = ImageFactoryConsole.new({:handler=>FactoryRestHandler.new(@l), :logger
=>@l})
@console.start
set :console, @console
+ set :logger, @l
end
# TODO: add validation for required params not being passed at all,
@@ -60,15 +61,25 @@ class ImageFactoryConnector < Sinatra::Base
end
post "/build" do
- puts "build method called with #{params.inspect}"
+ settings.logger.debug "build method called with #{params.inspect}"
@b=settings.console.build_image("#{params[:template]}",
"#{params[:target]}")
- builder :image
+ if @b.respond_to?(:image_id)
+ builder :image
+ else
+ settings.logger.error "Error Received: #{(a)b.inspect}"
+ 500
+ end
end
post "/push" do
- puts "push method called with #{params.inspect}"
+ settings.logger.debug "push method called with #{params.inspect}"
@b=settings.console.push_image("#{params[:image_id]}",
"#{params[:provider]}", "#{params[:credentials]}")
- builder :image
+ if @b.respond_to?(:image_id)
+ builder :image
+ else
+ settings.logger.error "Error Received: #{(a)b.inspect}"
+ 500
+ end
end
get "/shutdown" do
diff --git a/services/image_factory/image_factory_connector/spec/connector_spec.rb
b/services/image_factory/image_factory_connector/spec/connector_spec.rb
index 44badef..207e896 100644
--- a/services/image_factory/image_factory_connector/spec/connector_spec.rb
+++ b/services/image_factory/image_factory_connector/spec/connector_spec.rb
@@ -79,9 +79,33 @@ describe 'image_factory_connector app' do
end
end
- it 'closes the connection' do
- get 'shutdown'
- last_response.should be_ok
- last_response.body.should == "Console connection closed"
+ context "logs errors if method is called with no agent present" do
+ before(:each) do
+ app.logger = double('output')
+ app.console.q=nil
+ app.logger.should_receive(:debug).with(any_args())
+ end
+
+ it "logs a message when there is no agent present and build method is
called" do
+ app.logger.should_receive(:error).with(/Error Received/)
+ post 'build', {:template => '<template></template>',
:target => 'mock'}
+ end
+
+ it "returns a 500 error if an exception is thrown calling build in the
console" do
+ app.logger.should_receive(:error).with(/Error Received/)
+ post 'build', {:template => '<template></template>',
:target => 'mock'}
+ last_response.status.should == 500
+ end
+
+ it "logs a message when there is no agent present and push method is
called" do
+ app.logger.should_receive(:error).with(/Error Received/)
+ post 'push', {:image_id => 123, :provider => 'mock',
:credentials => 'some creds'}
+ end
+
+ it "returns a 500 error if an exception is thrown calling push in the
console" do
+ app.logger.should_receive(:error).with(/Error Received/)
+ post 'push', {:image_id => 123, :provider => 'mock',
:credentials => 'some creds'}
+ last_response.status.should == 500
+ end
end
end
--
1.7.4
11:50 a.m.
New subject: [PATCH conductor 2/2] Improve Error handling when there is no agent present.
Ack to this series.
----- Original Message -----
From: "Jason Guiditta" <jguiditt(a)redhat.com>
To: aeolus-devel(a)lists.fedorahosted.org
Sent: Monday, 28 March, 2011 10:34:04 PM
Subject: [PATCH conductor 2/2] Improve Error handling when there is no agent present.
Previously, the connector would throw a stack trace and stop
working properly if the factory agent was gone and a user
attempted an action, this patch adds logging and catches
this type of exceptionm as well as returning a 500 server error
to the caller, to be handled as desired. Future rev will return
the error string as well, but Conductor does nothing with errors
at this point anyway.
---
.../lib/image_factory/image_factory_console.rb | 20 +++++++++---
.../console/spec/image_factory/console_spec.rb | 25 ++++++++++++----
.../image_factory_connector.rb | 25 +++++++++++----
.../image_factory_connector/spec/connector_spec.rb | 32 +++++++++++++++++--
4 files changed, 80 insertions(+), 22 deletions(-)
diff --git a/services/image_factory/console/lib/image_factory/image_factory_console.rb
b/services/image_factory/console/lib/image_factory/image_factory_console.rb
index a1a5b8c..c196632 100644
--- a/services/image_factory/console/lib/image_factory/image_factory_console.rb
+++ b/services/image_factory/console/lib/image_factory/image_factory_console.rb
@@ -64,8 +64,13 @@ class ImageFactoryConsole < Qmf2::ConsoleHandler
def build_image(descriptor, target)
# TODO: return error if there is a problem calling this method or getting
# a factory instance
- response = factory.image(descriptor, target)
- build_adaptor(response)
+ begin
+ response = factory.image(descriptor, target)
+ build_adaptor(response)
+ rescue Exception => e
+ @logger.debug "Encountered error in build_image: #{e}"
+ return e
+ end
end
# Call this method to push an image to a provider, and get back an
@@ -80,8 +85,13 @@ class ImageFactoryConsole < Qmf2::ConsoleHandler
def push_image(image_id, provider, credentials)
# TODO: return error if there is a problem calling this method or getting
# a factory instance
- response = factory.provider_image(image_id, provider, credentials)
- build_adaptor(response)
+ begin
+ response = factory.provider_image(image_id, provider, credentials)
+ build_adaptor(response)
+ rescue Exception => e
+ @logger.debug "Encountered error in push_image: #{e}"
+ return e
+ end
end
#TODO: enhance both of these methods to handle multiple agents
@@ -132,7 +142,7 @@ class ImageFactoryConsole < Qmf2::ConsoleHandler
def build_adaptor(response)
imgfacaddr = Qmf2::DataAddr.new(response['build_adaptor'])
query = Qmf2::Query.new(imgfacaddr)
- @q.query(query).first
+ @q.query(query,5).first
end
end
diff --git a/services/image_factory/console/spec/image_factory/console_spec.rb
b/services/image_factory/console/spec/image_factory/console_spec.rb
index 4e3a0b1..9cd766d 100644
--- a/services/image_factory/console/spec/image_factory/console_spec.rb
+++ b/services/image_factory/console/spec/image_factory/console_spec.rb
@@ -8,7 +8,7 @@ module ImageFactory
@logger = Logger.new(STDOUT)
@logger.level = Logger::DEBUG
@logger.datetime_format = "%Y-%m-%d %H:%M:%S"
- @i = ImageFactoryConsole.new()
+ @i = ImageFactoryConsole.new() # Pass this in for more logging: (:logger =>
@logger)
@i.start
# Sadly, this is needed so we wait for an agent to appear.
# We might be able to extract this somewhere to hold off
@@ -97,11 +97,6 @@ module ImageFactory
@data.stub(:event).and_return("STATUS")
end
- it "should log an event" do
- @output.should_receive(:debug).with(/GOT AN EVENT/)
- @i2.event_raised(@agent, @data, Time.now, "horrid")
- end
-
it "should call handle on an event" do
@output.should_receive(:debug).with(/GOT AN EVENT/)
@@ -110,6 +105,24 @@ module ImageFactory
end
end
+ describe "#build_image" do
+ it "should gracefully handle errors" do
+ @output.should_receive(:debug).with(/Encountered error in build_image/)
+ @i2.q=nil
+ error = @i2.build_image("<template></template>",
"mock")
+ error.to_s.should include("undefined method")
+ end
+ end
+
+ describe "#push_image" do
+ it "should gracefully handle errors" do
+ @output.should_receive(:debug).with(/Encountered error in push_image/)
+ @i2.q=nil
+ error = @i2.push_image(123, "mock", "some creds")
+ error.to_s.should include("undefined method")
+ end
+ end
+
after(:each) do
@output.should_receive(:debug).with(/Closing/)
@i2.shutdown
diff --git
a/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
b/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
index 6338c09..e438dfe 100644
---
a/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
+++
b/services/image_factory/image_factory_connector/lib/image_factory_connector/image_factory_connector.rb
@@ -29,11 +29,12 @@ class ImageFactoryConnector < Sinatra::Base
set :port, 2003
set :app_file, __FILE__
set :views, File.dirname(__FILE__) + '/views'
- l = Logger.new(STDOUT)
- l.level = Logger::DEBUG
- @console = ImageFactoryConsole.new({:handler=>FactoryRestHandler.new(l), :logger
=>l})
+ @l = Logger.new(STDOUT)
+ @l.level = Logger::DEBUG
+ @console = ImageFactoryConsole.new({:handler=>FactoryRestHandler.new(@l), :logger
=>@l})
@console.start
set :console, @console
+ set :logger, @l
end
# TODO: add validation for required params not being passed at all,
@@ -60,15 +61,25 @@ class ImageFactoryConnector < Sinatra::Base
end
post "/build" do
- puts "build method called with #{params.inspect}"
+ settings.logger.debug "build method called with #{params.inspect}"
@b=settings.console.build_image("#{params[:template]}",
"#{params[:target]}")
- builder :image
+ if @b.respond_to?(:image_id)
+ builder :image
+ else
+ settings.logger.error "Error Received: #{(a)b.inspect}"
+ 500
+ end
end
post "/push" do
- puts "push method called with #{params.inspect}"
+ settings.logger.debug "push method called with #{params.inspect}"
@b=settings.console.push_image("#{params[:image_id]}",
"#{params[:provider]}", "#{params[:credentials]}")
- builder :image
+ if @b.respond_to?(:image_id)
+ builder :image
+ else
+ settings.logger.error "Error Received: #{(a)b.inspect}"
+ 500
+ end
end
get "/shutdown" do
diff --git a/services/image_factory/image_factory_connector/spec/connector_spec.rb
b/services/image_factory/image_factory_connector/spec/connector_spec.rb
index 44badef..207e896 100644
--- a/services/image_factory/image_factory_connector/spec/connector_spec.rb
+++ b/services/image_factory/image_factory_connector/spec/connector_spec.rb
@@ -79,9 +79,33 @@ describe 'image_factory_connector app' do
end
end
- it 'closes the connection' do
- get 'shutdown'
- last_response.should be_ok
- last_response.body.should == "Console connection closed"
+ context "logs errors if method is called with no agent present" do
+ before(:each) do
+ app.logger = double('output')
+ app.console.q=nil
+ app.logger.should_receive(:debug).with(any_args())
+ end
+
+ it "logs a message when there is no agent present and build method is
called" do
+ app.logger.should_receive(:error).with(/Error Received/)
+ post 'build', {:template => '<template></template>',
:target => 'mock'}
+ end
+
+ it "returns a 500 error if an exception is thrown calling build in the
console" do
+ app.logger.should_receive(:error).with(/Error Received/)
+ post 'build', {:template => '<template></template>',
:target => 'mock'}
+ last_response.status.should == 500
+ end
+
+ it "logs a message when there is no agent present and push method is
called" do
+ app.logger.should_receive(:error).with(/Error Received/)
+ post 'push', {:image_id => 123, :provider => 'mock',
:credentials => 'some creds'}
+ end
+
+ it "returns a 500 error if an exception is thrown calling push in the
console" do
+ app.logger.should_receive(:error).with(/Error Received/)
+ post 'push', {:image_id => 123, :provider => 'mock',
:credentials => 'some creds'}
+ last_response.status.should == 500
+ end
end
end
--
1.7.4
_______________________________________________
aeolus-devel mailing list
aeolus-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/aeolus-devel
4800
days inactive
4806
days old
aeolus-devel@lists.fedorahosted.org
9 comments
3 participants
participants (3)
-
Jason Guiditta -
Martyn Taylor -
Richard Su