Skip to content

Commit

Permalink
Fix issue #32 with parallelism parsing issues with postgres storage (#33
Browse files Browse the repository at this point in the history
)

Add build instructions in README
Bump up version to 0.3.3
  • Loading branch information
adejanovski authored Dec 15, 2016
1 parent 907a02b commit 26e261f
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 58 deletions.
44 changes: 23 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -278,26 +278,28 @@ Source code for all the REST resources can be found from package com.spotify.rea
Delete all the related repair runs before calling this endpoint.


Doing a Release (on this repository)
Building and running Reaper
------------------------------------

1. Go to the root of the cassandra-reaper project on your local Git clone.
2. In the pom.xml file, remove "-SNAPSHOT" from the version.
3. Add a new entry to the top of debian/changelog. You may just copy the latest entry and edit (be careful with formatting, and make sure to get the right version number).
4. Run "mvn clean verify".
5. Commit the changes with message "release version X.Y.Z".
6. Make a new tag called vX.Y.Z. Example: v0.1.1.
7. Run "git push".
8. Run "git push --tags".
9. Make a (release) build of the package, if required. For example start a Jenkins build deploy.
10. In the pom file, increment the version number and append "-SNAPSHOT".
11. Commit the changes with message "start development on X.Y.Z", where the version matches your current snapshot version.
12. Run "git push".
13. Deploy the released packages (there's cassandra-reaper and cassandra-reaper-cli).
14. Send a release note to users.

Notice that you can get a short list of changes since last release, by e.g.:

```
$ git log --no-merges --format="%h %<(18)%an %s" v0.2.1..HEAD
```
To build Reaper without rebuilding the UI, run the following command :

```mvn clean package```

To only regenerate the UI (requires npm and bower) :

```mvn generate-sources -Pbuild-ui```

To rebuild both the UI and Reaper :

```mvn clean package -Pbuild-ui```


### Running Reaper

After modifying the `resource/cassandra-reaper.yaml` config file, Reaper can be started using the following command line :

```java -jar target/cassandra-reaper-X.X.X.jar server resource/cassandra-reaper.yaml```

Once started, the UI can be accessed through : `http://127.0.0.1:8080/webui/`

Reaper can also be accessed using the REST API exposed on port 8080, or using the command line tool `bin/spreaper`
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<name>Cassandra Reaper</name>
<groupId>com.spotify</groupId>
<artifactId>cassandra-reaper</artifactId>
<version>0.3.2-SNAPSHOT</version>
<version>0.3.3-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
4 changes: 3 additions & 1 deletion resource/cassandra-reaper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jmxPorts:
logging:
level: INFO
loggers:
io.dropwizard: INFO
io.dropwizard: WARN
org.eclipse.jetty: WARN
appenders:
- type: console
Expand All @@ -39,6 +39,8 @@ server:
- type: http
port: 8081
bindHost: 0.0.0.0
requestLog:
appenders: []

database:
driverClass: org.postgresql.Driver
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ static DateTime getDateTimeOrNull(ResultSet r, String dbColumnName) throws SQLEx
public RepairRun map(int index, ResultSet r, StatementContext ctx) throws SQLException {
RepairRun.RunState runState = RepairRun.RunState.valueOf(r.getString("state"));
RepairParallelism repairParallelism =
RepairParallelism.valueOf(r.getString("repair_parallelism"));
RepairParallelism.fromName(r.getString("repair_parallelism"));
RepairRun.Builder repairRunBuilder =
new RepairRun.Builder(r.getString("cluster_name"),
r.getLong("repair_unit_id"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public RepairSchedule map(int index, ResultSet r, StatementContext ctx) throws S
RepairRunMapper.getDateTimeOrNull(r, "next_activation"),
ImmutableList.copyOf(runHistoryLong),
r.getInt("segment_count"),
RepairParallelism.valueOf(r.getString("repair_parallelism")),
RepairParallelism.fromName(r.getString("repair_parallelism")),
r.getDouble("intensity"),
RepairRunMapper.getDateTimeOrNull(r, "creation_time"))
.owner(r.getString("owner"))
Expand Down
20 changes: 10 additions & 10 deletions src/main/resources/assets/deps.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/resources/assets/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 8 additions & 11 deletions src/main/resources/assets/repair.js

Large diffs are not rendered by default.

19 changes: 8 additions & 11 deletions src/main/resources/assets/schedules.js

Large diffs are not rendered by default.

0 comments on commit 26e261f

Please sign in to comment.