Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Change licence to AGPLv3. This must not so be important, but I don't …

…like the cloud horror that comming to us. So...

Actionner is more clean, more comment and functions. Will be merge with poller soon.
  • Loading branch information...
commit 0052d2891c114b5bc815236565edf81d8f544022 1 parent 5ddc6ed
naparuba authored
Showing with 238 additions and 146 deletions.
  1. +67 −81 COPYING
  2. +171 −65 src/actionner.py
View
148 COPYING
@@ -1,5 +1,5 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
Preamble
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
+software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
The precise terms and conditions for copying, distribution and
modification follow.
@@ -72,7 +60,7 @@ modification follow.
0. Definitions.
- "This License" refers to version 3 of the GNU General Public License.
+ "This License" refers to version 3 of the GNU Affero General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
- 13. Use with the GNU Affero General Public License.
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
@@ -635,41 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
+ it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ GNU Affero General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
View
236 src/actionner.py
@@ -11,6 +11,7 @@
import sys
import Pyro.core
import select
+
from message import Message
from worker import Worker
from util import get_sequence
@@ -144,22 +145,13 @@ def manage_return(self):
del verifs[id]
- #Main function, will loop forever
- def main(self):
- #Daemon init
- Pyro.core.initServer()
- self.port = int(sys.argv[1])
- print "Port:", self.port
- self.daemon = Pyro.core.Daemon(port=self.port)
- #If the port is not free, pyro take an other. I don't like that!
- if self.daemon.port != self.port:
- print "Sorry, the port %d was not free" % self.port
- sys.exit(1)
- self.uri2 = self.daemon.connect(IForArbiter(self),"ForArbiter")
-
- #We wait for initial conf
+ #Use to wait conf from arbiter.
+ #It send us conf in our daemon. It put the have_conf prop if he send us something
+ #(it can just do a ping)
+ def wait_for_initial_conf(self):
print "Waiting for initial configuration"
timeout = 1.0
+ #Arbiter do not already set our have_conf param
while not self.have_conf :
socks = self.daemon.getServerSockets()
avant = time.time()
@@ -178,7 +170,114 @@ def main(self):
timeout = 1.0
if timeout < 0:
- timeout = 1.0
+ timeout = 1.0
+
+
+ #The arbiter can resent us new conf in the daemon port.
+ #We do not want to loose time about it, so it's not a bloking wait, timeout = 0s
+ #If it send us a new conf, we reinit the connexions of all schedulers
+ def watch_for_new_conf(self):
+ timeout_daemon = 0.0
+ socks = self.daemon.getServerSockets()
+ ins,outs,exs = select.select(socks,[],[],timeout_daemon) # 'foreign' event loop
+ if ins != []:
+ for sock in socks:
+ if sock in ins:
+ self.daemon.handleRequests()
+ for sched_id in self.schedulers:
+ self.pynag_con_init(sched_id)
+
+
+ #Workers are process. We need to clean them some time (see zombie part)
+ #Here we create new workers if the queue load (len of verifs) is too long
+ #here it's > 80% of workers
+ def adjust_worker_number_by_load(self):
+ nb_queue = 0 # Len of actions in queue status, so the "working" queue
+ for sched_id in self.schedulers:
+ verifs = self.schedulers[sched_id]['verifs']
+ tmp_nb_queue = len([elt for elt in verifs.keys() if verifs[elt].get_status() == 'queue'])
+ nb_queue += tmp_nb_queue
+ nb_waitforhomerun = len([elt for elt in verifs.keys() if verifs[elt].get_status() == 'waitforhomerun'])
+ #Just print stat sometimes
+ if not i % 10:
+ print '[%d]Stats : Workers:%d Check %d (Queued:%d ReturnWait:%d)' % (sched_id, len(self.workers), len(verifs), tmp_nb_queue, nb_waitforhomerun)
+
+ #We add new worker if the queue is > 80% of the worker number
+ while nb_queue > 0.8 * len(self.workers) and len(self.workers) < 20:
+ id = self.seq_worker.next()
+ print "Allocate New worker : ",id
+ self.workers[id] = Worker(id, self.s, self.m, mortal=True)
+ self.workers[id].start()
+
+
+ #We get new actions from schedulers, we create a Message ant we put it in the s queue (from master to slave)
+ def get_new_actions(self):
+ new_checks = []
+ #We check for new check
+ for sched_id in self.schedulers:
+ try:
+ con = self.schedulers[sched_id]['con']
+ if con is not None: #None = not initilized
+ tmp_verifs = con.get_checks(do_checks=False, do_actions=True)
+ print "We've got new verifs" , tmp_verifs
+ for v in tmp_verifs:
+ v.sched_id = sched_id
+ new_checks.extend(tmp_verifs)
+ except Pyro.errors.ProtocolError as exp:
+ print exp
+ #we reinitialise the ccnnexion to pynag
+ self.pynag_con_init(sched_id)
+ except Exception,x:
+ print ''.join(Pyro.util.getPyroTraceback(x))
+ sys.exit(0)
+ #Ok, we've got new actions in new_checks
+ #so we put them in queue state and we put in in the working queue for workers
+ for chk in new_checks:
+ chk.set_status('queue')
+ verifs = self.schedulers[chk.sched_id]['verifs']
+ id = chk.get_id()
+ verifs[id] = chk
+ msg = Message(id=0, type='Do', data=verifs[id])
+ self.s.put(msg)
+
+
+ #Main function, will loop forever
+ def main(self):
+ #Daemon init
+ Pyro.core.initServer()
+ self.port = int(sys.argv[1])
+ print "Port:", self.port
+ self.daemon = Pyro.core.Daemon(port=self.port)
+ #If the port is not free, pyro take an other. I don't like that!
+ if self.daemon.port != self.port:
+ print "Sorry, the port %d was not free" % self.port
+ sys.exit(1)
+ self.uri2 = self.daemon.connect(IForArbiter(self),"ForArbiter")
+
+ #We wait for initial conf
+ self.wait_for_initial_conf()
+
+ #print "Waiting for initial configuration"
+ #timeout = 1.0
+ #while not self.have_conf :
+ # socks = self.daemon.getServerSockets()
+ # avant = time.time()
+ # ins,outs,exs = select.select(socks,[],[],timeout) # 'foreign' event loop
+ # if ins != []:
+ # for sock in socks:
+ # if sock in ins:
+ # self.daemon.handleRequests()
+ # print "Apres handle : Have conf?", self.have_conf
+ # apres = time.time()
+ # diff = apres-avant
+ # timeout = timeout - diff
+ # break # no need to continue with the for loop
+ # else: #Timeout
+ # print "Waiting for a configuration"
+ # timeout = 1.0
+ #
+ # if timeout < 0:
+ # timeout = 1.0
#Connexion init with PyNag server
@@ -203,15 +302,16 @@ def main(self):
#Now we check if arbiter speek to us in the daemon. If so, we listen for it
#When it push us conf, we reinit connexions
- timeout_daemon = 0.0
- socks = self.daemon.getServerSockets()
- ins,outs,exs = select.select(socks,[],[],timeout_daemon) # 'foreign' event loop
- if ins != []:
- for sock in socks:
- if sock in ins:
- self.daemon.handleRequests()
- for sched_id in self.schedulers:
- self.pynag_con_init(sched_id)
+ self.watch_for_new_conf()
+ #timeout_daemon = 0.0
+ #socks = self.daemon.getServerSockets()
+ #ins,outs,exs = select.select(socks,[],[],timeout_daemon) # 'foreign' event loop
+ #if ins != []:
+ # for sock in socks:
+ # if sock in ins:
+ # self.daemon.handleRequests()
+ # for sched_id in self.schedulers:
+ # self.pynag_con_init(sched_id)
try:
msg = self.m.get(timeout=timeout)
@@ -238,51 +338,57 @@ def main(self):
self.zombies = self.newzombies
self.newzombies = []
- nb_queue = 0 # Len of actions in queue status, so the "working" queue
- for sched_id in self.schedulers:
- verifs = self.schedulers[sched_id]['verifs']
- tmp_nb_queue = len([elt for elt in verifs.keys() if verifs[elt].get_status() == 'queue'])
- nb_queue += tmp_nb_queue
- nb_waitforhomerun = len([elt for elt in verifs.keys() if verifs[elt].get_status() == 'waitforhomerun'])
- #Just print stat sometimes
- if not i % 10:
- print '[%d]Stats : Workers:%d Check %d (Queued:%d ReturnWait:%d)' % (sched_id, len(self.workers), len(verifs), tmp_nb_queue, nb_waitforhomerun)
+ #Maybe we do not have enouth workers, we check for it
+ #and launch new ones if need
+ self.adjust_worker_number_by_load()
+ #nb_queue = 0 # Len of actions in queue status, so the "working" queue
+ #for sched_id in self.schedulers:
+ # verifs = self.schedulers[sched_id]['verifs']
+ # tmp_nb_queue = len([elt for elt in verifs.keys() if verifs[elt].get_status() == 'queue'])
+ # nb_queue += tmp_nb_queue
+ # nb_waitforhomerun = len([elt for elt in verifs.keys() if verifs[elt].get_status() == 'waitforhomerun'])
+ # #Just print stat sometimes
+ # if not i % 10:
+ # print '[%d]Stats : Workers:%d Check %d (Queued:%d ReturnWait:%d)' % (sched_id, len(self.workers), len(verifs), tmp_nb_queue, nb_waitforhomerun)
#We add new worker if the queue is > 80% of the worker number
- while nb_queue > 0.8 * len(self.workers) and len(self.workers) < 20:
- id = self.seq_worker.next()
- print "Allocate New worker : ",id
- self.workers[id] = Worker(id, self.s, self.m, mortal=True)
- self.workers[id].start()
+ #while nb_queue > 0.8 * len(self.workers) and len(self.workers) < 20:
+ # id = self.seq_worker.next()
+ # print "Allocate New worker : ",id
+ # self.workers[id] = Worker(id, self.s, self.m, mortal=True)
+ # self.workers[id].start()
- new_checks = []
+ #Now we can get new actions from schedulers
+ self.get_new_actions()
+
+ #new_checks = []
#We check for new check
- for sched_id in self.schedulers:
- try:
- con = self.schedulers[sched_id]['con']
- if con is not None: #None = not initilized
- tmp_verifs = con.get_checks(do_checks=False, do_actions=True)
- print "We've got new verifs" , tmp_verifs
- for v in tmp_verifs:
- v.sched_id = sched_id
- new_checks.extend(tmp_verifs)
- except Pyro.errors.ProtocolError as exp:
- print exp
- #we reinitialise the ccnnexion to pynag
- self.pynag_con_init(sched_id)
- except Exception,x:
- print ''.join(Pyro.util.getPyroTraceback(x))
- sys.exit(0)
- #Ok, we've got new actions in new_checks
- #so we put them in queue state and we put in in the working queue for workers
- for chk in new_checks:
- chk.set_status('queue')
- verifs = self.schedulers[chk.sched_id]['verifs']
- id = chk.get_id()
- verifs[id] = chk
- msg = Message(id=0, type='Do', data=verifs[id])
- #print "S avant plantage:", s
- self.s.put(msg)
+ #for sched_id in self.schedulers:
+ # try:
+ # con = self.schedulers[sched_id]['con']
+ # if con is not None: #None = not initilized
+ # tmp_verifs = con.get_checks(do_checks=False, do_actions=True)
+ # print "We've got new verifs" , tmp_verifs
+ # for v in tmp_verifs:
+ # v.sched_id = sched_id
+ # new_checks.extend(tmp_verifs)
+ # except Pyro.errors.ProtocolError as exp:
+ # print exp
+ # #we reinitialise the ccnnexion to pynag
+ # self.pynag_con_init(sched_id)
+ # except Exception,x:
+ # print ''.join(Pyro.util.getPyroTraceback(x))
+ # sys.exit(0)
+ ##Ok, we've got new actions in new_checks
+ ##so we put them in queue state and we put in in the working queue for workers
+ #for chk in new_checks:
+ # chk.set_status('queue')
+ # verifs = self.schedulers[chk.sched_id]['verifs']
+ # id = chk.get_id()
+ # verifs[id] = chk
+ # msg = Message(id=0, type='Do', data=verifs[id])
+ # #print "S avant plantage:", s
+ # self.s.put(msg)
#We send all finished checks
Please sign in to comment.
Something went wrong with that request. Please try again.