September 2011 - tor-commits - lists.torproject.org

[pytorctl/master] WARN when circ_status_event fails to query Router
by mikeperry＠torproject.org 31 Aug '11

31 Aug '11

commit 37f612706ad384d7a1d34a33268f3d1d8449d5f2 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jul 7 14:58:37 2011 -0700 WARN when circ_status_event fails to query Router --- SQLSupport.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index 1e2971b..c9951d7 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -24,6 +24,7 @@ from TorCtl import EVENT_TYPE, EVENT_STATE, TorCtlError import sqlalchemy import sqlalchemy.orm.exc from sqlalchemy.orm import scoped_session, sessionmaker, eagerload, lazyload, eagerload_all +from sqlalchemy.orm.exc import NoResultFound from sqlalchemy import create_engine, and_, or_, not_, func from sqlalchemy.sql import func,select,alias,case from sqlalchemy.schema import ThreadLocalMetaData,MetaData @@ -870,8 +871,13 @@ class CircuitListener(TorCtl.PreEventListener): last_extend=c.arrived_at) if self.track_parent: for r in self.parent_handler.circuits[c.circ_id].path: - rq = Router.query.options(eagerload('circuits')).filter_by( + try: + rq = Router.query.options(eagerload('circuits')).filter_by( idhex=r.idhex).with_labels().one() + except NoResultFound: + plog("WARN", "Query for Router %s=%s in circ %s failed but was in parent_handler" % + (r.nickname, r.idhex, circ.circ_id)) + return; circ.routers.append(rq) #rq.circuits.append(circ) # done automagically? #tc_session.add(rq)

1 0

[pytorctl/master] remove ;
by mikeperry＠torproject.org 31 Aug '11

31 Aug '11

commit 4a990f47e5ecd26af4f6459ae6d63ea36dd88f00 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 31 16:24:27 2011 -0700 remove ; --- SQLSupport.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index 5933707..efee35b 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -879,7 +879,8 @@ class CircuitListener(TorCtl.PreEventListener): except NoResultFound: plog("WARN", "Query for Router %s=%s in circ %s failed but was in parent_handler" % (r.nickname, r.idhex, circ.circ_id)) - return; + tc_session.remove() + return circ.routers.append(rq) #rq.circuits.append(circ) # done automagically? #tc_session.add(rq)

1 0

[pytorctl/master] placeholder for call to refresh_all()
by mikeperry＠torproject.org 31 Aug '11

31 Aug '11

commit 741cc04db278cede4bbe0c9e0147066fbfd00a4b Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jul 7 15:21:26 2011 -0700 placeholder for call to refresh_all() suspicious session behavior may require refreshing all objects in order to keep tc_session and sessions bound to Elixir synchronized --- SQLSupport.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index c9951d7..718bf35 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -772,6 +772,8 @@ class ConsensusTrackerListener(TorCtl.DualEventListener): tc_session.add(r) plog("INFO", "Consensus db updated") tc_session.commit() + # testing + #refresh_all() # Too many sessions, don't trust commit() def update_consensus(self): plog("INFO", "Updating DB with full consensus.")

1 0

[pytorctl/master] use Elixir model delete method
by mikeperry＠torproject.org 31 Aug '11

31 Aug '11

commit db835ef1f6a252d9923be766f1d7dc813ea9a4eb Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 31 16:09:00 2011 -0700 use Elixir model delete method try to use the same session for deletes and queries where possible, this may be the cause of an ObjectNotFound exception that occurs right after _update_db(), despite the Router object being in the consensus and also in the db. --- SQLSupport.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index 718bf35..5933707 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -1023,7 +1023,7 @@ class StreamListener(CircuitListener): (s.strm_id not in self.parent_handler.streams or \ self.parent_handler.streams[s.strm_id].ignored): if strm: - tc_session.delete(strm) + strm.delete() tc_session.commit() return # Ignore streams that aren't ours @@ -1038,7 +1038,7 @@ class StreamListener(CircuitListener): strm.circuit = Circuit.query.filter_by(circ_id=s.circ_id).first() if not strm.circuit: plog("NOTICE", "Ignoring prior stream "+str(strm.strm_id)+" with old circuit "+str(s.circ_id)) - tc_session.delete(strm) + strm.delete() tc_session.commit() return else:

1 0

[pytorctl/master] add function to get current branch and head
by mikeperry＠torproject.org 31 Aug '11

31 Aug '11

commit a3ed3d01ff93df9d25dc64ffbacfcb6b4ef0befa Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 31 17:07:27 2011 -0700 add function to get current branch and head --- TorUtil.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/TorUtil.py b/TorUtil.py index b8d6425..50258e5 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -417,3 +417,25 @@ Usage: lzprob(z) prob = ((1.0-x)*0.5) return prob +def get_git_version(path_to_repo): + """ Returns a tuple of the branch and head from a git repo (.git) + if available, or returns ('unknown', 'unknown') + """ + try: + f = open(path_to_repo+'HEAD') + ref = f.readline().strip().split(' ') + f.close() + except IOError, e: + plog('ERROR', e) + return ('unknown','unknown') + try: + f = open(path_to_repo+ref[1]) + branch = ref[1].strip().split('/')[-1] + head = f.readline().strip() + f.close() + return (branch, head) + except IOError, e: + plog('ERROR', e) + except IndexError, e: + plog('ERROR', e) + return ('unknown','unknown')

1 0