History | View | Annotate | Download (4.3 kB)
Fix breakage caused by the logic-refactoring merge
This commit fixes some breakage caused by the recent merge ofthe logic-refactoring branch, mainly related to db/db_controller.py.
The main reason was the different value of import path, fixed bymaking sure all imports are rooted in synnefo....
Merge branch 'master' into logic-refactoring
Conflicts: db/db_controller.py
move GANETI_ZMQ_PUBLISHER option to settings
Move process_backend_msg to beckend.py
Moved id_from_instance_name static method to utils.py
fix settings import
Fix db/db_controller.py bug triggering 0mq bug
Fix db/db_controller.py bug triggering 0mq assertion failurein ganeti-0mqd, by forcing unique ZMQ_IDENTITY strings for eachdb_controller instance.
The identity string is built using the hostname where db_controller...
Minor fixes in VM model and db_controller.py
Added comments for VirtualMachine attributes pertainingto internal operating state (ACTIONS, OPER_STATES, etc.).
Minor fixes in db_controller.py.
Make ZMQ thread in db_controller stoppable.
Make db_controller run all 0mq operations in a separate StoppableThreadwith a stop() method. The main thread calls it, then publishes on an in-procPUB socket to interrupt any zmq_recv() call and join the thread when cleaning...
Private fields in VM model, updated fixtures
Updated names of fields pertaining to VM state in VirtualMachine model,updated fixtures.
database.sqlite can be removed, use:
rm database.sqlite; python manage.py syncdb
to recreate it from fixtures.
Use zmq_recv() in dedicated thread in db_controller.
It seems Python can only do signal processing in the main thread.If the main thread calls zmq_recv(), no exceptions get raisedwhen a SIGINT is received for example.
WIP:This moves the zmq_recv() to a separate thread, while the main...
Fix path issue.
What commit b4141604 should have contained.
The proper contents of commit b4141604 are included here.
rename dbcontrol and charger into proper python name