Skip to content

Commit 0eccae2

Browse files
authored
Merge db1d136 into 104c1e8
2 parents 104c1e8 + db1d136 commit 0eccae2

File tree

17 files changed

+185
-126
lines changed

17 files changed

+185
-126
lines changed

.travis.yml

Lines changed: 0 additions & 106 deletions
This file was deleted.

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,18 @@
1919

2020
# OpenWhisk
2121

22-
[![Build Status](https://travis-ci.com/apache/openwhisk.svg?branch=master)](https://travis-ci.com/github/apache/openwhisk)
2322
[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
2423
[![Join Slack](https://img.shields.io/badge/join-slack-9B69A0.svg)](https://openwhisk-team.slack.com/)
25-
[![codecov](https://codecov.io/gh/apache/openwhisk/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/openwhisk)
2624
[![Twitter](https://img.shields.io/twitter/follow/openwhisk.svg?style=social&logo=twitter)](https://twitter.com/intent/follow?screen_name=openwhisk)
2725

26+
[![Unit Tests](https://github.com/apache/openwhisk/actions/workflows/1-unit.yaml/badge.svg)](https://github.com/apache/openwhisk/actions/workflows/1-unit.yaml)
27+
[![System Tests](https://github.com/apache/openwhisk/actions/workflows/2-system.yaml/badge.svg)](https://github.com/apache/openwhisk/actions/workflows/2-system.yaml)
28+
[![MultiRuntime Tests](https://github.com/apache/openwhisk/actions/workflows/3-multi-runtime.yaml/badge.svg)](https://github.com/apache/openwhisk/actions/workflows/3-multi-runtime.yaml)
29+
[![Standalone Tests](https://github.com/apache/openwhisk/actions/workflows/4-standalone.yaml/badge.svg)](https://github.com/apache/openwhisk/actions/workflows/4-standalone.yaml)
30+
[![Scheduler Tests](https://github.com/apache/openwhisk/actions/workflows/5-scheduler.yaml/badge.svg)](https://github.com/apache/openwhisk/actions/workflows/5-scheduler.yaml)
31+
[![Performance Tests](https://github.com/apache/openwhisk/actions/workflows/6-performance.yaml/badge.svg)](https://github.com/apache/openwhisk/actions/workflows/6-performance.yaml)
32+
[![codecov](https://codecov.io/gh/apache/openwhisk/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/openwhisk)
33+
2834
OpenWhisk is a serverless functions platform for building cloud applications.
2935
OpenWhisk offers a rich programming model for creating serverless APIs from functions,
3036
composing functions into serverless workflows, and connecting events to functions using rules and triggers.

ansible/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ If you prefer [Docker-machine](https://docs.docker.com/machine/) to [Docker for
4646
The remote Docker API is required for collecting logs using the Ansible playbook [logs.yml](logs.yml).
4747

4848
##### Activate docker0 network (local dev only)
49-
49+
5050
The OpenWhisk deployment via Ansible uses the `docker0` network interface to deploy OpenWhisk and it does not exist on Docker for Mac environment.
5151

5252
An expedient workaround is to add alias for `docker0` network to loopback interface.
@@ -72,9 +72,9 @@ In all instructions, replace `<openwhisk_home>` with the base directory of your
7272

7373
#### Ansible with pyenv (local dev only)
7474

75-
When using [pyenv](https://github.com/pyenv/pyenv) to manage your versions of python, the [ansible python interpreter](https://docs.ansible.com/ansible/latest/reference_appendices/python_3_support.html) will use your system's default python, which may have a different version.
75+
When using [pyenv](https://github.com/pyenv/pyenv) to manage your versions of python, the [ansible python interpreter](https://docs.ansible.com/ansible/latest/reference_appendices/python_3_support.html) will use your system's default python, which may have a different version.
7676

77-
To make sure ansible uses the same version of python which you configured, execute:
77+
To make sure ansible uses the same version of python which you configured, execute:
7878

7979
```bash
8080
echo -e "\nansible_python_interpreter: `which python`\n" >> ./environments/local/group_vars/all
@@ -87,7 +87,7 @@ up again. To avoid this problem, export the `OPENWHISK_TMP_DIR` variable assigni
8787
directory before deploying OpenWhisk.
8888

8989
#### Setup
90-
90+
9191
This step should be executed once per development environment.
9292
It will generate the `hosts` configuration file based on your environment settings.
9393

@@ -154,7 +154,7 @@ You can enable the new scheduler of OpenWhisk.
154154
It will run one more component called "scheduler" and ETCD.
155155

156156
#### Configure service providers for the scheduler
157-
You can update service providers for the scheduler as follows.
157+
You can update service providers for the scheduler as follows.
158158

159159
**common/scala/src/main/resources/reference.conf**
160160

ansible/roles/schedulers/tasks/clean.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
117
---
218
# Remove scheduler containers.
319

ansible/roles/schedulers/tasks/deploy.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
2-
# license agreements; and to You under the Apache License, Version 2.0.
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
317
---
418
# This role will install Scheduler in group 'schedulers' in the environment
519
# inventory

ansible/roles/schedulers/tasks/join_akka_cluster.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
2-
# license agreements; and to You under the Apache License, Version 2.0.
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
317
---
418
#
519
# Scheduler 'plugin' that will add the items necessary to the scheduler

ansible/roles/schedulers/tasks/main.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
117
---
218
# This role will install scheduler in group 'schedulers' in the environment inventory
319
# In deploy mode it will deploy schedulers.

ansible/scheduler.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
2-
# license agreements; and to You under the Apache License, Version 2.0.
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
317
---
418
# This playbook deploys Openwhisk Controllers.
519

common/scala/src/main/scala/org/apache/openwhisk/core/etcd/EtcdWorker.scala

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
118
package org.apache.openwhisk.core.etcd
219

320
import akka.actor.{Actor, ActorRef, ActorSystem, Props, Timers}

proposals/POEM-3-action-limit-for-namespace.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ As the namespace default limit is the same as the system limit, so the administr
177177

178178
### Namespace limit validation
179179

180-
Previously, system limits were validated when deserializing the `ActionLimits` object from the user request.
180+
Previously, system limits were validated when deserializing the `ActionLimits` object from the user request.
181181

182182
However, at the time of deserialization of the user requests, the namespace's action limit cannot be known and the limit value cannot be included in an error message, so the validation must be performed after deserialization.
183183
Therefore, the code to perform this validation has been added to the controller, scheduler, and invoker.
@@ -211,7 +211,7 @@ If the namespace limits or system limits are exceeded, the namespace limit value
211211

212212
#### 2. Validate action limits when the action is executed in the invoker
213213

214-
When the action is executed, the invoker must checks whether the action limit exceeds the system limit and namespace limits.
214+
When the action is executed, the invoker must checks whether the action limit exceeds the system limit and namespace limits.
215215
If the limit of the action to be executed exceeds the limit, an application error with `Messages.actionLimitExceeded` message is returned and invocation is aborted.
216216

217217
```scala

0 commit comments

Comments
 (0)