Skip to content
This repository was archived by the owner on Apr 24, 2023. It is now read-only.

remove file server from sidecar #1963

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions sidecar/cook/sidecar/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import sys
import threading

from cook.sidecar import exit_sentinel, file_server, progress, util
from cook.sidecar import exit_sentinel, progress, util
from cook.sidecar.version import VERSION


Expand All @@ -35,10 +35,6 @@ def main(args=None):

parser = argparse.ArgumentParser(description='Cook Sidecar')
parser.add_argument('--exit-sentinel-file-path', metavar='PATH', help='file path which signals this process to exit when it appears')
parser.add_argument('--file-server-port', type=int, metavar='PORT', help='file server port number')
parser.add_argument('--file-server-threads', type=int, default=2, metavar='THREADS', help='file server threads-per-worker count')
parser.add_argument('--file-server-workers', type=int, default=2, metavar='WORKERS', help='file server worker process count')
parser.add_argument('--no-file-server', action='store_true', help='disable sandbox file server')
parser.add_argument('--no-progress-reporter', action='store_true', help='disable progress reporter')
parser.add_argument('--version', action='version', version=f'Cook Sidecar {VERSION}')
options = parser.parse_args(args or sys.argv[1:])
Expand All @@ -57,10 +53,6 @@ def main(args=None):
if options.exit_sentinel_file_path:
exit_sentinel.watch_for_file(options.exit_sentinel_file_path, all_started_event)

# Start Flask file server (blocking)
if not options.no_file_server:
file_server_args = [options.file_server_port, options.file_server_workers, options.file_server_threads]
exit_code = file_server.start_file_server(all_started_event, file_server_args)
# Wait for progress reporter threads (blocking)
elif not options.no_progress_reporter:
all_started_event.set()
Expand Down
246 changes: 0 additions & 246 deletions sidecar/cook/sidecar/file_server.py

This file was deleted.

2 changes: 1 addition & 1 deletion sidecar/cook/sidecar/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = '1.2.1'
VERSION = '1.3.0'
3 changes: 1 addition & 2 deletions sidecar/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

requirements = [
'flask~=1.1.0',
'gunicorn~=19.9.0',
'requests~=2.22.0',
]

Expand All @@ -17,7 +16,7 @@
name='cook_sidecar',
version=version.VERSION,
description="Two Sigma's Cook Sidecar",
long_description="The Cook Sidecar provides sandbox file access and progress reporting.",
long_description="The Cook Sidecar provides progress reporting.",
packages=['cook.sidecar'],
entry_points={'console_scripts': ['cook-sidecar = cook.sidecar.__main__:main']},
install_requires=requirements,
Expand Down