Skip to content

Commit

Permalink
Revert the Mesos code deletions (#970)
Browse files Browse the repository at this point in the history
This turned out to be unsafe to to our use of pickles as a serialization format.

* Revert "Use the latest task_proc (#966)"

This reverts commit 01003a9.

* Revert "Delete remaining Mesos code (#961)"

This reverts commit 1f71d0f.

* Revert "Delete Mesos related exit codes and docker files - TRON-2187 (#959)"

This reverts commit 33ad2a1.

* Revert "Delete Mesos logging config (#962)"

This reverts commit 6403624.

* Revert "Merge pull request #953 from Yelp/u/emanelsabban/TRON-2183"

This reverts commit 1035345, reversing
changes made to e411408.

* Revert "Deleting Mesos code from the Master Control Program"

This reverts commit 18f48ee.
  • Loading branch information
nemacysts authored Jun 3, 2024
1 parent 3cab0a1 commit 56deebf
Show file tree
Hide file tree
Showing 30 changed files with 2,406 additions and 86 deletions.
14 changes: 13 additions & 1 deletion dev/logging.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[loggers]
keys=root, twisted, tron, tron.serialize.runstate.statemanager, tron.api.www.access, task_processing, yelp_lib.clog.StreamTailer
keys=root, twisted, tron, tron.serialize.runstate.statemanager, tron.api.www.access, task_processing, tron.mesos.task_output, pymesos, yelp_lib.clog.StreamTailer

[handlers]
keys=stdoutHandler, accessHandler, nullHandler
Expand Down Expand Up @@ -41,6 +41,18 @@ handlers=stdoutHandler
qualname=task_processing
propagate=0

[logger_pymesos]
level=DEBUG
handlers=stdoutHandler
qualname=pymesos
propagate=0

[logger_tron.mesos.task_output]
level=INFO
handlers=nullHandler
qualname=tron.mesos.task_output
propagate=0

[handler_stdoutHandler]
class=logging.StreamHandler
level=DEBUG
Expand Down
2 changes: 1 addition & 1 deletion requirements-minimal.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pytimeparse
pytz
PyYAML>=5.1
requests
task_processing[k8s]
task_processing[mesos_executor,k8s]
Twisted>=19.7.0
urllib3>=1.24.2
Werkzeug>=0.15.3
5 changes: 4 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
addict==2.2.1
argcomplete==1.9.5
asttokens==2.2.1
attrs==19.3.0
Expand All @@ -24,6 +25,7 @@ ecdsa==0.13.3
executing==1.2.0
future==0.18.3
google-auth==1.23.0
http-parser==0.9.0
humanize==0.5.1
hyperlink==19.0.0
idna==2.8
Expand Down Expand Up @@ -60,6 +62,7 @@ pyasn1-modules==0.2.8
pycparser==2.19
pyformance==0.4
Pygments==2.13.0
pymesos==0.3.9
pyrsistent==0.15.4
pysensu-yelp==0.4.4
PyStaticConfiguration==0.10.4
Expand All @@ -77,7 +80,7 @@ setuptools==65.5.1
six==1.15.0
sshpubkeys==3.1.0
stack-data==0.6.2
task-processing==1.0.0
task-processing==0.14.0
traitlets==5.0.0
Twisted==22.10.0
typing-extensions==4.5.0
Expand Down
Loading

0 comments on commit 56deebf

Please sign in to comment.