Skip to content

Remove unnecessary env var & reposition env var source #1184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 30, 2020
Merged

Remove unnecessary env var & reposition env var source #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
abfeae7
Remove unnecessary env & reposition env source
RobertLucian Jun 29, 2020
9cdc5cd
Set default max replica concurrency for local dep
RobertLucian Jun 29, 2020
db09518
Merge branch 'master' into refactor/env-variables
RobertLucian Jun 29, 2020
ad14a55
Add comment to indicate what the param stands for
RobertLucian Jun 30, 2020
38d6f51
Merge branch 'master' into refactor/env-variables
RobertLucian Jun 30, 2020
9b1c8aa
Merge branch 'master' into refactor/env-variables
deliahu Jun 30, 2020
fb1ba65
Add comment
deliahu Jun 30, 2020
0f4f61f
Merge branch 'master' into refactor/env-variables
vishalbollu Jun 30, 2020
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
2 changes: 1 addition & 1 deletion cli/local/docker_spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func getAPIEnv(api *spec.API, awsClient *aws.Client) []string {
"CORTEX_THREADS_PER_PROCESS="+s.Int32(api.Predictor.ThreadsPerProcess),
// add 1 because it was required to achieve the target concurrency for 1 process, 1 thread
"CORTEX_MAX_PROCESS_CONCURRENCY="+s.Int64(1+int64(math.Round(float64(consts.DefaultMaxReplicaConcurrency)/float64(api.Predictor.ProcessesPerReplica)))),
"CORTEX_SO_MAX_CONN=1000",
"CORTEX_SO_MAX_CONN="+s.Int64(consts.DefaultMaxReplicaConcurrency+100), // add a buffer to be safe
"AWS_REGION="+awsClient.Region,
)

Expand Down
4 changes: 0 additions & 4 deletions pkg/operator/resources/syncapi/k8s_specs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,6 @@ func getEnvVars(api *spec.API, container string) []kcore.EnvVar {
Name: "CORTEX_THREADS_PER_PROCESS",
Value: s.Int32(api.Predictor.ThreadsPerProcess),
},
kcore.EnvVar{
Name: "CORTEX_MAX_REPLICA_CONCURRENCY",
Value: s.Int64(api.Autoscaling.MaxReplicaConcurrency),
},
kcore.EnvVar{
Name: "CORTEX_MAX_PROCESS_CONCURRENCY",
// add 1 because it was required to achieve the target concurrency for 1 process, 1 thread
Expand Down
14 changes: 7 additions & 7 deletions pkg/workloads/cortex/serve/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ rm -rf /mnt/workspace/api_readiness.txt
# allow for the liveness check to pass until the API is running
echo "9999999999" > /mnt/workspace/api_liveness.txt

# export environment variables
if [ -f "/mnt/project/.env" ]; then
set -a
source /mnt/project/.env
set +a
fi

export PYTHONPATH=$PYTHONPATH:$PYTHON_PATH
# ensure predictor print() statements are always flushed
export PYTHONUNBUFFERED=TRUE
Expand All @@ -49,13 +56,6 @@ if [ "$CORTEX_PROVIDER" != "local" ]; then
sysctl -w net.ipv4.tcp_fin_timeout=30 >/dev/null
fi

# export environment variables
if [ -f "/mnt/project/.env" ]; then
set -a
source /mnt/project/.env
set +a
fi

# execute script if present in project's directory
if [ -f "/mnt/project/dependencies.sh" ]; then
bash -e /mnt/project/dependencies.sh
Expand Down
4 changes: 3 additions & 1 deletion pkg/workloads/cortex/serve/start_uvicorn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ def main():
host="0.0.0.0",
port=int(os.environ["CORTEX_SERVING_PORT"]),
workers=int(os.environ["CORTEX_PROCESSES_PER_REPLICA"]),
limit_concurrency=int(os.environ["CORTEX_MAX_PROCESS_CONCURRENCY"]),
limit_concurrency=int(
os.environ["CORTEX_MAX_PROCESS_CONCURRENCY"]
), # this is a per process limit
backlog=int(os.environ["CORTEX_SO_MAX_CONN"]),
log_config=log_config,
log_level="info",
Expand Down