develop: Update upgrade check handling in OMERO.web by chris-allan · Pull Request #2177 · ome/openmicroscopy

chris-allan · 2014-03-18T13:42:46Z

This pull requests updates the base socket timeout semantics of the OMERO.py upgrade check and allows for upgrade check configurability in OMERO.web. OMERO tickets addressed include:

#12097 (https://trac.openmicroscopy.org.uk/ome/ticket/12097)

To test timeouts, you will need a merge build with the changes included. Running under bin/omero shell:

from omero.util.upgrade_check import UpgradeCheck
from datetime import datetime

uc = UpgradeCheck('omero', url='http://134.36.64.142/')
print datetime.now()
uc.run()
print datetime.now()

134.36.64.142 is a University of Dundee firewalled IP address that can be used for internal or external testing. Default timeouts should be in the neighbourhood of 3 seconds. Example output:

$ bin/omero shell
WARNING:omero.util.UpgradeCheck:UPGRADE AVAILABLE:Please upgrade to 5.0.0 See http://trac.openmicroscopy.org.uk/omero for the latest version

Python 2.7.6 (default, Feb 18 2014, 10:06:14) 
Type "copyright", "credits" or "license" for more information.

IPython 1.1.0 -- An enhanced Interactive Python.
?         -> Introduction and overview of IPython's features.
%quickref -> Quick reference.
help      -> Python's own help system.
object?   -> Details about 'object', use 'object??' for extra details.

In [1]: %cpaste
Pasting code; enter '--' alone on the line to stop or use Ctrl-D.
:from omero.util.upgrade_check import UpgradeCheck
:from datetime import datetime
:
:uc = UpgradeCheck('omero', url='http://134.36.64.142/')
:print datetime.now()
:uc.run()
:print datetime.now()
:<EOF>
2014-03-18 13:27:49.661802
ERROR:omero.util.UpgradeCheck:<urlopen error timed out>
2014-03-18 13:27:52.663269

If needed the timeout can be adjusted and checked (example is a timeout of 10 seconds) by using:

...
uc = UpgradeCheck('omero', timeout=10.0, url='http://134.36.64.142/')
...

OMERO.web upgrade check configurability can also be tested with a merge build. Running under DJANGO_SETTINGS_MODULE=settings PYTHONPATH=$PYTHONPATH:lib/python/omeroweb bin/omero shell:

from omeroweb.webadmin.webadmin_utils import upgradeCheck
from datetime import datetime

print datetime.now()
upgradeCheck()
print datetime.now()

Disabled upgrade checks should return instantly. Example output:

$ bin/omero config set omero.upgrades.url ''
$ bin/omero config get
omero.upgrades.url=
$ DJANGO_SETTINGS_MODULE=settings PYTHONPATH=$PYTHONPATH:lib/python/omeroweb bin/omero shell
WARNING:omero.util.UpgradeCheck:UPGRADE AVAILABLE:Please upgrade to 5.0.0 See http://trac.openmicroscopy.org.uk/omero for the latest version

Python 2.7.6 (default, Feb 18 2014, 10:06:14) 
Type "copyright", "credits" or "license" for more information.

IPython 1.1.0 -- An enhanced Interactive Python.
?         -> Introduction and overview of IPython's features.
%quickref -> Quick reference.
help      -> Python's own help system.
object?   -> Details about 'object', use 'object??' for extra details.

In [1]: %cpaste
Pasting code; enter '--' alone on the line to stop or use Ctrl-D.
:from omeroweb.webadmin.webadmin_utils import upgradeCheck
:from datetime import datetime
:
:print datetime.now()
:upgradeCheck()
:print datetime.now()
:<EOF>
2014-03-18 13:35:25.614548
2014-03-18 13:35:25.622826

The source branch for this pull request has been based atop the v.4.4.0 tag so that it can be merged cleanly into:

dev_4_4 (dev_4_4: Update upgrade check handling in OMERO.web #2175)
dev_5_0 (dev_5_0: Update upgrade check handling in OMERO.web #2176)
develop (develop: Update upgrade check handling in OMERO.web #2177)

--rebased-from #2176

Python socket timeouts are specified in seconds as floating point. This commit sets the default timeout to a more reasonable 3 seconds, allows the specification of a floating point timeout value, removes the assumption that the timeout is specified in milliseconds and documents all of the aforementioned.

This commit adds configurability to the upgrade check URL via the OMERO.web configuration mechanism. Upgrade checks in OMERO.web can now be disabled by running: bin/omero config set omero.web.upgrades_url ''

mtbc · 2014-03-19T12:22:56Z

From default timeout fromUpgradeCheck('omero', url='http://134.36.64.142/') I am getting output like

2014-03-19 12:17:40.742183
ERROR:omero.util.UpgradeCheck:<urlopen error [Errno 113] No route to host>
2014-03-19 12:17:40.743741

but then again

 time nc 134.36.64.142 80
(UNKNOWN) [134.36.64.142] 80 (http) : No route to host

real    0m0.003s
user    0m0.000s
sys 0m0.000s

Is there some server that is routable but drops packets without rejecting them or something, so I can get a better hang?

mtbc · 2014-03-19T12:25:56Z

Still to update copyrights in headers to include 2014.

chris-allan · 2014-03-19T12:35:52Z

The headers have been updated by other commits in both dev_5_0 and develop since the v.4.4.0 tag that this branch is based on in. Messing around with the years in the header is going to create merge conflicts.

mtbc · 2014-03-19T12:46:55Z

I don't seem to be able to change the timeout. For instance,

:from omero.util.upgrade_check import UpgradeCheck
:from datetime import datetime
:
:uc = UpgradeCheck('omero', timeout=10.0, url='http://10.12.2.207/')
:print datetime.now()
:uc.run()
:print datetime.now()
:--
2014-03-19 12:42:45.598970
ERROR:omero.util.UpgradeCheck:<urlopen error [Errno 113] No route to host>
2014-03-19 12:42:48.599036

(Unless there is coincidentally a three-second timeout on trying to find routes to hosts?)
I'm happy to let others decide about the importance of copyright headers, someday maybe we can just update them all based on git commit history anyway. (-:

mtbc · 2014-03-19T12:50:39Z

Ha ha, yes, actually there is a coincidence, now can continue testing:

$ time nc 10.12.2.208 80
(UNKNOWN) [10.12.2.208] 80 (http) : No route to host

real    0m3.001s
user    0m0.000s
sys 0m0.000s

chris-allan · 2014-03-19T12:52:04Z

I'm happy to change the copyright headers, just not on this branch. It'll end up being more work to change them, manage all the rebasing and conflicts than the actual code changes themselves.

Wow that's annoying with respect to the timeouts! :)

mtbc · 2014-03-19T12:53:15Z

That's all fine, thank you: good to merge.

chris-allan · 2014-03-19T12:57:27Z

@mtbc: No issues similar to @will-moore on #2176 with respect to disabling the check all together?

mtbc · 2014-03-19T12:59:48Z

No, it's still in my xterm scrollback fortunately:

In [1]: %cpaste
Pasting code; enter '--' alone on the line to stop.
:from omero.util.upgrade_check import UpgradeCheck
:from datetime import datetime
:
:uc = UpgradeCheck('omero', url='')
:print datetime.now()
:uc.run()
:print datetime.now()
:--
2014-03-19 12:52:47.845047
2014-03-19 12:52:47.845099

Setting the time-out to 0 works fine too.

chris-allan · 2014-03-19T13:01:11Z

Great. 👍

I'm going to try and do something clever on the copyright years, if it works, great otherwise I'll open a series of other PRs to update them.

mtbc · 2014-03-19T13:01:27Z

Ah, I didn't try with bin/omero config set -- if he sees some problem you don't, I can have a go.

chris-allan · 2014-03-19T13:03:00Z

You'll need to try with bin/omero config set and the OMERO.web environment variables, etc. yes as in the second stanza. I think he's now seeing everything that's expected when setting the configuration explicitly.

will-moore · 2014-03-19T13:05:54Z

Copyright years are handled elsewhere in the web with #2149

mtbc · 2014-03-19T13:16:38Z

Yup, all seems good. (-:

joshmoore · 2014-04-01T07:51:31Z

See merge comment under gh-2175.

develop: Update upgrade check handling in OMERO.web

chris-allan added 2 commits March 18, 2014 11:20

Support for configuring the upgrade check URL (See #12097)

bdf8c52

This commit adds configurability to the upgrade check URL via the OMERO.web configuration mechanism. Upgrade checks in OMERO.web can now be disabled by running: bin/omero config set omero.web.upgrades_url ''

This was referenced Mar 18, 2014

dev_4_4: Update upgrade check handling in OMERO.web #2175

Merged

dev_5_0: Update upgrade check handling in OMERO.web #2176

Merged

Use existing "omero.upgrades.url" configuration option

4858115

chris-allan added the develop label Mar 20, 2014

joshmoore added a commit that referenced this pull request Apr 1, 2014

Merge pull request #2177 from chris-allan/12097-socket-timeout

9daa6b0

develop: Update upgrade check handling in OMERO.web

joshmoore merged commit 9daa6b0 into ome:develop Apr 1, 2014

sbesson added this to the 5.1.0-m1 milestone Oct 14, 2014

Conversation

chris-allan commented Mar 18, 2014

Uh oh!

mtbc commented Mar 19, 2014

Uh oh!

mtbc commented Mar 19, 2014

Uh oh!

chris-allan commented Mar 19, 2014

Uh oh!

mtbc commented Mar 19, 2014

Uh oh!

mtbc commented Mar 19, 2014

Uh oh!

chris-allan commented Mar 19, 2014

Uh oh!

mtbc commented Mar 19, 2014

Uh oh!

chris-allan commented Mar 19, 2014

Uh oh!

mtbc commented Mar 19, 2014

Uh oh!

chris-allan commented Mar 19, 2014

Uh oh!

mtbc commented Mar 19, 2014

Uh oh!

chris-allan commented Mar 19, 2014

Uh oh!

will-moore commented Mar 19, 2014

Uh oh!

mtbc commented Mar 19, 2014

Uh oh!

joshmoore commented Apr 1, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants