-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Backroll Plugin #8251
Open
PeterBackroll
wants to merge
69
commits into
apache:main
Choose a base branch
from
DIMSI-IS:Backroll
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3,288
−0
Open
Backroll Plugin #8251
Changes from all commits
Commits
Show all changes
69 commits
Select commit
Hold shift + click to select a range
1f51822
Bug fix + new features for backroll
PeterBackroll 85080de
Add apache license, remove useless files
PeterBackroll bf2c036
Merge branch 'main' into Backroll
PeterBackroll ffa89a4
Fix Backroll version
PeterBackroll f792fb5
Merge branch 'apache:main' into Backroll
PeterBackroll f80a318
Merge branch 'apache:main' into Backroll
PeterBackroll 813929a
Update for restoreBackedUpVolume
PeterBackroll 7012adf
Fix styling and logging
PeterBackroll bf9b4a7
Merge branch 'apache:main' into Backroll
PeterBackroll 56ab08f
Fix pom and restoreBackedUpVolume
PeterBackroll beeef61
Merge branch 'Backroll' of https://github.com/DIMSI-IS/cloudstack int…
PeterBackroll c3262ec
Merge branch 'apache:main' into Backroll
PeterBackroll e4ef123
Merge branch 'apache:main' into Backroll
m-dhellin bf78e4c
fix: spelling
PeterBackroll b6fbfc7
Restored git friendly EOF
m-dhellin d21cd12
Reorganized imports
m-dhellin 9c83c2b
Reorganized imports
m-dhellin 2d580ff
Checked license
m-dhellin c087de4
Merge branch '4.19'
DaanHoogland d6181d5
Fix `updateTemplatePermission` when the UI is set to a language other…
lucas-a-martins 50a993c
Factorized duplicated code
m-dhellin 1d7ca77
Merge branch 'apache:main' into Backroll
m-dhellin 63bdc0f
Factorized duplicated code
m-dhellin e4b212f
Extracted string constants
m-dhellin 561b9b6
Refactored some null checks
m-dhellin 8e3c8f7
Naming
m-dhellin 01c2238
WIP error handling
m-dhellin d37a35b
Refactoring error handling
m-dhellin e9cbe0e
Revert "Refactoring error handling"
PeterBackroll 6a690b7
Revert "WIP error handling"
PeterBackroll 3e90f8e
WIP
PeterBackroll 9ceb106
Fix communication between CS and Backroll
PeterBackroll 82b503e
Fix deserialization + fix connection stability
PeterBackroll 5eae848
divers
PeterBackroll 6550806
Bug on list of vm on the instances
PeterBackroll 36f935d
Merge branch 'Backroll-dev' of https://github.com/DIMSI-IS/cloudstack…
PeterBackroll 3959fdb
Merge branch 'main' of https://github.com/apache/cloudstack into Back…
PeterBackroll 4e0ea82
Merge remote-tracking branch 'upstream/main' into Backroll-dev
PeterBackroll bd0bc0f
Don't delete backup when we dissociate backup offering
PeterBackroll 61cafe2
Merge branch 'main' into Backroll
PeterBackroll 5729e84
General refactoring
PeterBackroll da787f0
Merge branch 'Backroll' of https://github.com/DIMSI-IS/cloudstack int…
PeterBackroll 3543554
Sync Backroll dev before merge backroll
PeterBackroll e05c6f7
Merge branch 'Backroll-dev' of https://github.com/DIMSI-IS/cloudstack…
PeterBackroll 6ed21e2
Fix Version Pom
PeterBackroll 112ea11
Fix lint errors and log
PeterBackroll fe180a1
fix license
PeterBackroll a1b3d75
fix license
PeterBackroll abc7191
Merge branch 'Backroll' into Backroll-dev + Test unitaite
PeterBackroll cbe491a
Unit Test
PeterBackroll 7887858
Merge branch 'Backroll' into Backroll-dev
PeterBackroll 31c3be4
Lint fix
PeterBackroll 4b05c8c
Lint fix
PeterBackroll ab25490
Merge with Backroll + bug backup
PeterBackroll eb400da
Merge branch 'Backroll' into Backroll-dev
PeterBackroll 0ea2ce5
UT + correction bug
PeterBackroll a4d8809
UT on BackrollBackUpProvider
PeterBackroll eb46332
UT + refactoring to test
PeterBackroll a2dcaf2
Error unused import
PeterBackroll 81d9669
UT + unnessary login remove
PeterBackroll 0a4c33d
UT
PeterBackroll 878b3c6
Update build_backroll_plugin.sh
PeterBackroll fabd4ae
Update plugins/backup/backroll/pom.xml
PeterBackroll 0dfeccb
Remove unsed import from test file
PeterBackroll f36283e
remove of build_backroll_plugin.sh
PeterBackroll 9e33b09
Merge branch 'apache:main' into Backroll
m-dhellin 5753e6a
Revert of files from ui
PeterBackroll 2377b71
Revert of files from ui
PeterBackroll 010728e
End-of-file
PeterBackroll File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
core/src/main/resources/META-INF/cloudstack/bootstrap/default-config-resources.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<!-- | ||
|
||
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. | ||
|
||
--> | ||
<beans xmlns="http://www.springframework.org/schema/beans" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://www.springframework.org/schema/beans | ||
http://www.springframework.org/schema/beans/spring-beans.xsd"> | ||
|
||
<bean id="DefaultConfigResources" class="com.yourcompany.YourConfigClass"> | ||
<!-- properties of the bean --> | ||
</bean> | ||
|
||
</beans> |
44 changes: 44 additions & 0 deletions
44
...main/resources/META-INF/cloudstack/bootstrap/spring-bootstrap-context-inheritable.xml.ori
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
!-- | ||
|
||
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. | ||
|
||
--> | ||
<beans xmlns="http://www.springframework.org/schema/beans" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xmlns:context="http://www.springframework.org/schema/context" | ||
xmlns:aop="http://www.springframework.org/schema/aop" | ||
xsi:schemaLocation="http://www.springframework.org/schema/beans | ||
http://www.springframework.org/schema/beans/spring-beans.xsd | ||
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd | ||
http://www.springframework.org/schema/context | ||
http://www.springframework.org/schema/context/spring-context.xsd" | ||
> | ||
|
||
<context:annotation-config /> | ||
|
||
<!-- Import additional configuration --> | ||
<import resource="classpath:default-config-resources.xml"/> | ||
|
||
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> | ||
<property name="order" value="100" /> | ||
<property name="ignoreResourceNotFound" value="true" /> | ||
<property name="ignoreUnresolvablePlaceholders" value="true" /> | ||
<property name="locations" ref="DefaultConfigResources" /> | ||
</bean> | ||
|
||
</beans> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
# | ||
# 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. | ||
# | ||
|
||
|
||
# management server clustering parameters, change cluster.node.IP to the machine IP address | ||
# in which the management server is running | ||
cluster.node.IP=127.0.0.1 | ||
cluster.servlet.port=9090 | ||
region.id=1 | ||
|
||
# CloudStack database settings | ||
db.cloud.username=cloud | ||
db.cloud.password=cloud | ||
db.root.password=12345 | ||
db.cloud.host=localhost | ||
db.cloud.driver=jdbc:mysql | ||
db.cloud.port=3306 | ||
db.cloud.name=cloud | ||
|
||
# CloudStack database tuning parameters | ||
db.cloud.maxActive=250 | ||
db.cloud.maxIdle=30 | ||
db.cloud.maxWait=10000 | ||
db.cloud.autoReconnect=true | ||
db.cloud.validationQuery=SELECT 1 | ||
db.cloud.testOnBorrow=true | ||
db.cloud.testWhileIdle=true | ||
db.cloud.timeBetweenEvictionRunsMillis=40000 | ||
db.cloud.minEvictableIdleTimeMillis=240000 | ||
db.cloud.poolPreparedStatements=false | ||
db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&prepStmtCacheSqlLimit=4096&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'&serverTimezone=UTC | ||
|
||
# usage database settings | ||
db.usage.username=cloud | ||
db.usage.password=cloud | ||
db.usage.host=localhost | ||
# It's not guaranteed that using a different DB provider than the one from the regular cloud DB will work | ||
db.usage.driver=jdbc:mysql | ||
db.usage.port=3306 | ||
db.usage.name=cloud_usage | ||
|
||
# usage database tuning parameters | ||
db.usage.maxActive=100 | ||
db.usage.maxIdle=30 | ||
db.usage.maxWait=10000 | ||
db.usage.autoReconnect=true | ||
db.usage.url.params=serverTimezone=UTC | ||
|
||
# Simulator database settings | ||
db.simulator.username=cloud | ||
db.simulator.password=cloud | ||
db.simulator.host=localhost | ||
# It's not guaranteed that using a different DB provider than the one from the regular cloud DB will work | ||
db.simulator.driver=jdbc:mysql | ||
db.simulator.port=3306 | ||
db.simulator.name=simulator | ||
db.simulator.maxActive=250 | ||
db.simulator.maxIdle=30 | ||
db.simulator.maxWait=10000 | ||
db.simulator.autoReconnect=true | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
<!-- | ||
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. | ||
--> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<artifactId>cloud-plugin-backup-backroll</artifactId> | ||
<name>Apache CloudStack Plugin - BackRoll Backup and Recovery Plugin by DIMSI</name> | ||
<parent> | ||
<artifactId>cloudstack-plugins</artifactId> | ||
<groupId>org.apache.cloudstack</groupId> | ||
<version>4.21.0.0-SNAPSHOT</version> | ||
<relativePath>../../pom.xml</relativePath> | ||
</parent> | ||
<dependencies> | ||
<dependency> | ||
<groupId>org.apache.cloudstack</groupId> | ||
<artifactId>cloud-api</artifactId> | ||
<version>${project.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.cloudstack</groupId> | ||
<artifactId>cloud-utils</artifactId> | ||
<version>${project.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.json</groupId> | ||
<artifactId>json</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.github.tomakehurst</groupId> | ||
<artifactId>wiremock-standalone</artifactId> | ||
<version>${cs.wiremock.version}</version> | ||
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
</project> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How does this new file relate to the plugin?