Skip to content
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
wants to merge 69 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
1f51822
Bug fix + new features for backroll
PeterBackroll Nov 14, 2023
85080de
Add apache license, remove useless files
PeterBackroll Apr 30, 2024
bf2c036
Merge branch 'main' into Backroll
PeterBackroll Aug 1, 2024
ffa89a4
Fix Backroll version
PeterBackroll Aug 1, 2024
f792fb5
Merge branch 'apache:main' into Backroll
PeterBackroll Aug 29, 2024
f80a318
Merge branch 'apache:main' into Backroll
PeterBackroll Sep 9, 2024
813929a
Update for restoreBackedUpVolume
PeterBackroll Sep 9, 2024
7012adf
Fix styling and logging
PeterBackroll Sep 10, 2024
bf9b4a7
Merge branch 'apache:main' into Backroll
PeterBackroll Sep 10, 2024
56ab08f
Fix pom and restoreBackedUpVolume
PeterBackroll Sep 11, 2024
beeef61
Merge branch 'Backroll' of https://github.com/DIMSI-IS/cloudstack int…
PeterBackroll Sep 11, 2024
c3262ec
Merge branch 'apache:main' into Backroll
PeterBackroll Sep 12, 2024
e4ef123
Merge branch 'apache:main' into Backroll
m-dhellin Sep 30, 2024
bf78e4c
fix: spelling
PeterBackroll Oct 1, 2024
b6fbfc7
Restored git friendly EOF
m-dhellin Oct 1, 2024
d21cd12
Reorganized imports
m-dhellin Oct 1, 2024
9c83c2b
Reorganized imports
m-dhellin Oct 1, 2024
2d580ff
Checked license
m-dhellin Oct 1, 2024
c087de4
Merge branch '4.19'
DaanHoogland Oct 2, 2024
d6181d5
Fix `updateTemplatePermission` when the UI is set to a language other…
lucas-a-martins Oct 4, 2024
50a993c
Factorized duplicated code
m-dhellin Oct 7, 2024
1d7ca77
Merge branch 'apache:main' into Backroll
m-dhellin Oct 7, 2024
63bdc0f
Factorized duplicated code
m-dhellin Oct 7, 2024
e4b212f
Extracted string constants
m-dhellin Oct 7, 2024
561b9b6
Refactored some null checks
m-dhellin Oct 7, 2024
8e3c8f7
Naming
m-dhellin Oct 7, 2024
01c2238
WIP error handling
m-dhellin Oct 15, 2024
d37a35b
Refactoring error handling
m-dhellin Oct 15, 2024
e9cbe0e
Revert "Refactoring error handling"
PeterBackroll Oct 21, 2024
6a690b7
Revert "WIP error handling"
PeterBackroll Oct 21, 2024
3e90f8e
WIP
PeterBackroll Oct 28, 2024
9ceb106
Fix communication between CS and Backroll
PeterBackroll Oct 30, 2024
82b503e
Fix deserialization + fix connection stability
PeterBackroll Nov 5, 2024
5eae848
divers
PeterBackroll Nov 5, 2024
6550806
Bug on list of vm on the instances
PeterBackroll Nov 7, 2024
36f935d
Merge branch 'Backroll-dev' of https://github.com/DIMSI-IS/cloudstack…
PeterBackroll Nov 7, 2024
3959fdb
Merge branch 'main' of https://github.com/apache/cloudstack into Back…
PeterBackroll Nov 7, 2024
4e0ea82
Merge remote-tracking branch 'upstream/main' into Backroll-dev
PeterBackroll Nov 7, 2024
bd0bc0f
Don't delete backup when we dissociate backup offering
PeterBackroll Nov 15, 2024
61cafe2
Merge branch 'main' into Backroll
PeterBackroll Dec 13, 2024
5729e84
General refactoring
PeterBackroll Dec 13, 2024
da787f0
Merge branch 'Backroll' of https://github.com/DIMSI-IS/cloudstack int…
PeterBackroll Dec 13, 2024
3543554
Sync Backroll dev before merge backroll
PeterBackroll Dec 13, 2024
e05c6f7
Merge branch 'Backroll-dev' of https://github.com/DIMSI-IS/cloudstack…
PeterBackroll Dec 13, 2024
6ed21e2
Fix Version Pom
PeterBackroll Dec 13, 2024
112ea11
Fix lint errors and log
PeterBackroll Dec 13, 2024
fe180a1
fix license
PeterBackroll Dec 13, 2024
a1b3d75
fix license
PeterBackroll Dec 13, 2024
abc7191
Merge branch 'Backroll' into Backroll-dev + Test unitaite
PeterBackroll Dec 13, 2024
cbe491a
Unit Test
PeterBackroll Dec 13, 2024
7887858
Merge branch 'Backroll' into Backroll-dev
PeterBackroll Dec 13, 2024
31c3be4
Lint fix
PeterBackroll Dec 16, 2024
4b05c8c
Lint fix
PeterBackroll Dec 16, 2024
ab25490
Merge with Backroll + bug backup
PeterBackroll Dec 16, 2024
eb400da
Merge branch 'Backroll' into Backroll-dev
PeterBackroll Dec 16, 2024
0ea2ce5
UT + correction bug
PeterBackroll Dec 20, 2024
a4d8809
UT on BackrollBackUpProvider
PeterBackroll Dec 20, 2024
eb46332
UT + refactoring to test
PeterBackroll Dec 20, 2024
a2dcaf2
Error unused import
PeterBackroll Dec 20, 2024
81d9669
UT + unnessary login remove
PeterBackroll Dec 20, 2024
0a4c33d
UT
PeterBackroll Dec 20, 2024
878b3c6
Update build_backroll_plugin.sh
PeterBackroll Dec 23, 2024
fabd4ae
Update plugins/backup/backroll/pom.xml
PeterBackroll Dec 23, 2024
0dfeccb
Remove unsed import from test file
PeterBackroll Jan 10, 2025
f36283e
remove of build_backroll_plugin.sh
PeterBackroll Jan 10, 2025
9e33b09
Merge branch 'apache:main' into Backroll
m-dhellin Jan 10, 2025
5753e6a
Revert of files from ui
PeterBackroll Jan 10, 2025
2377b71
Revert of files from ui
PeterBackroll Jan 10, 2025
010728e
End-of-file
PeterBackroll Jan 10, 2025
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,4 @@ scripts/.pydevproject
venv
node_modules
.vscode
*.bz2
10 changes: 10 additions & 0 deletions client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,11 @@
<artifactId>cloud-plugin-integrations-prometheus-exporter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-backup-backroll</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-backup-dummy</artifactId>
Expand Down Expand Up @@ -1001,6 +1006,11 @@
<artifactId>cloud-plugin-backup-veeam</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-backup-backroll</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
Expand Down
76 changes: 76 additions & 0 deletions developer/utils/conf/db.properties
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
Comment on lines +1 to +76
Copy link
Contributor

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?

45 changes: 45 additions & 0 deletions plugins/backup/backroll/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<!--
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.19.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>
</dependencies>
</project>
Loading
Loading