Commit ca83fd73 authored by 向偲彪's avatar 向偲彪
Browse files
parents bfcdc17d cddf803b
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ jobs:
        uses: actions/setup-java@v1
        with:
          java-version: 1.8
      - name: Git fetch unshallow
        run: |
          git fetch --unshallow
          git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
          git fetch origin
      - name: Compile
        run: |
          export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
@@ -56,11 +61,6 @@ jobs:
        if: github.event_name == 'pull_request'
        run: |
          CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)
      - name: Git fetch unshallow
        run: |
          git fetch --unshallow
          git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
          git fetch origin
      - name: Run SonarCloud Analysis
        run: >
          mvn verify --batch-mode
+67 −27
Original line number Diff line number Diff line
* First from the remote repository *https://github.com/apache/incubator-dolphinscheduler.git* fork code to your own repository

* there are three branches in the remote repository currently:
     * master normal delivery branch
            After the stable version is released, the code for the stable version branch is merged into the master branch.
# Development

    * dev daily development branch
            The daily development branch, the newly submitted code can pull requests to this branch.
Start by forking the dolphinscheduler GitHub repository, make changes in a branch and then send a pull request.

## Set up your dolphinscheduler GitHub Repository

* Clone your own warehouse to your local
There are three branches in the remote repository currently:
  - `master` : normal delivery branch. After the stable version is released, the code for the stable version branch is merged into the master branch.
            
    `git clone https://github.com/apache/incubator-dolphinscheduler.git`
  - `dev` : daily development branch. The daily development branch, the newly submitted code can pull requests to this branch.
  
* Add remote repository address, named upstream
  - `x.x.x-release` : the stable release version.

   `git remote add upstream https://github.com/apache/incubator-dolphinscheduler.git`
So, you should fork the `dev` branch.

* View repository:
After forking the [dolphinscheduler upstream source repository](https://github.com/apache/incubator-dolphinscheduler/fork) to your personal repository, you can set your  personal development environment.

    `git remote -v`
```sh
$ cd <your work direcotry>
$ git clone < your personal forked dolphinscheduler repo>
$ cd incubator-dolphinscheduler
```

## Set git remote as ``upstream``

Add remote repository address, named upstream

> There will be two repositories at this time: origin (your own warehouse) and upstream (remote repository)
```sh
git remote add upstream https://github.com/apache/incubator-dolphinscheduler.git
```

View repository:

* Get/update remote repository code (already the latest code, skip it)
```sh
git remote -v
```

   `git fetch upstream`
There will be two repositories at this time: origin (your own warehouse) and upstream (remote repository)

Get/update remote repository code (already the latest code, skip it).

* Synchronize remote repository code to local repository

```sh
git fetch upstream
```

Synchronize remote repository code to local repository

```sh
git checkout origin/dev
git merge --no-ff upstream/dev
```
@@ -41,24 +59,46 @@ git checkout -b dev-1.0 upstream/dev-1.0
git push --set-upstream origin dev1.0
```

* After modifying the code locally, submit it to your own repository:
## Create your feature branch
Before making code changes, make sure you create a separate branch for them.

```sh
$ git checkout -b <your-feature>
```

## Commit changes
After modifying the code locally, submit it to your own repository:

`git commit -m 'test commit'`
`git push`
```sh

git commit -m 'information about your feature'
```

## Push to the branch

* Submit changes to the remote repository

* On the github page, click on the new pull request.
Push your locally committed changes to the remote origin (your fork).

```
$ git push origin <your-feature>
```

## Create a pull request

After submitting changes to your remote repository, you should click on the new pull request On the following github page.

<p align = "center">
<img src = "http://geek.analysys.cn/static/upload/221/2019-04-02/90f3abbf-70ef-4334-b8d6-9014c9cf4c7f.png" width ="60%"/>
</p>

* Select the modified local branch and the branch to merge past to create a pull request.

Select the modified local branch and the branch to merge past to create a pull request.

<p align = "center">
<img src = "http://geek.analysys.cn/static/upload/221/2019-04-02/fe7eecfe-2720-4736-951b-b3387cf1ae41.png" width ="60%"/>
</p>

*  Next, the administrator is responsible for **merging** to complete the pull request
Next, the administrator is responsible for **merging** to complete the pull request.



+2 −2
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@ to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License.  You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE_2.0
    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

"""


import sys
from resource_management import *
from resource_management.core.logger import Logger
+15 −0
Original line number Diff line number Diff line
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements.  See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership.  The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License.  You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
version: '2'
services:
  zookeeper:
+5 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import org.apache.dolphinscheduler.dao.AlertDao;
import org.apache.dolphinscheduler.dao.DaoFactory;
import org.apache.dolphinscheduler.dao.entity.Alert;
import org.apache.dolphinscheduler.dao.entity.User;
import org.junit.Ignore;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,7 +33,6 @@ import java.util.*;

/**
 */
@Ignore
public class MailUtilsTest {
    private static final Logger logger = LoggerFactory.getLogger(MailUtilsTest.class);
    @Test
@@ -138,8 +137,10 @@ public class MailUtilsTest {
     * Table
     */
    @Test
    public void addAlertTable(){
    public void testAddAlertTable(){
        logger.info("testAddAlertTable");
        AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
        Assert.assertNotNull(alertDao);
        Alert alert = new Alert();
        alert.setTitle("Mysql Exception");
        alert.setShowType(ShowType.TABLE);
@@ -149,6 +150,7 @@ public class MailUtilsTest {
        alert.setAlertType(AlertType.EMAIL);
        alert.setAlertGroupId(1);
        alertDao.addAlert(alert);
        logger.info("" +alert);
    }

    @Test
Loading