You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2015/12/09 18:06:31 UTC
[06/21] stratos git commit: configuration for enabling initial
artifact backup
configuration for enabling initial artifact backup
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/762ffd7d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/762ffd7d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/762ffd7d
Branch: refs/heads/stratos-4.1.x
Commit: 762ffd7d765522f6659c603389a95dbb75fe0e6f
Parents: 7fc829e
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Wed Dec 9 18:11:13 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Wed Dec 9 18:11:13 2015 +0530
----------------------------------------------------------------------
.../src/main/python/cartridge.agent/cartridge.agent/agent.conf | 1 +
.../src/main/python/cartridge.agent/cartridge.agent/config.py | 3 +++
.../src/main/python/cartridge.agent/cartridge.agent/constants.py | 1 +
.../cartridge.agent/plugins/DefaultArtifactCheckout.py | 3 ++-
4 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/762ffd7d/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.conf
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.conf b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.conf
index a8c8a19..6875d25 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.conf
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.conf
@@ -45,3 +45,4 @@ APPLICATION_PATH =APPLICATION-PATH
metadata.service.url =METADATA-SERVICE-URL
super.tenant.repository.path =/repository/deployment/server/
tenant.repository.path =/repository/tenants/
+enable.initial.artifact.backup =ENABLE_INITIAL_ARTIFACT_UPDATE
http://git-wip-us.apache.org/repos/asf/stratos/blob/762ffd7d/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py
index f1a70ec..baea8e8 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py
@@ -112,6 +112,8 @@ class Config:
""" :type : str """
super_tenant_repository_path = None
""" :type : str """
+ backup_initial_artifacts = False
+ """ :type : bool """
deployment = None
""" :type : str """
manager_service_name = None
@@ -346,6 +348,7 @@ class Config:
Config.lb_public_ip = Config.read_property(constants.LB_PUBLIC_IP, False)
Config.tenant_repository_path = Config.read_property(constants.TENANT_REPO_PATH, False)
Config.super_tenant_repository_path = Config.read_property(constants.SUPER_TENANT_REPO_PATH, False)
+ Config.backup_initial_artifacts = Config.read_property(constants.ENABLE_INITIAL_ARTIFACT_BACKUP, False)
Config.is_primary = Config.read_property(constants.CLUSTERING_PRIMARY_KEY, False)
http://git-wip-us.apache.org/repos/asf/stratos/blob/762ffd7d/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py
index 4672579..93879d1 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py
@@ -77,6 +77,7 @@ SUPERTENANT_TEMP_PATH = "/tmp/-1234/"
SUPER_TENANT_REPO_PATH = "super.tenant.repository.path"
TENANT_REPO_PATH = "tenant.repository.path"
+ENABLE_INITIAL_ARTIFACT_BACKUP = "enable.initial.artifact.backup"
# topic names to subscribe
INSTANCE_NOTIFIER_TOPIC = "instance/#"
http://git-wip-us.apache.org/repos/asf/stratos/blob/762ffd7d/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/plugins/DefaultArtifactCheckout.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/plugins/DefaultArtifactCheckout.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/plugins/DefaultArtifactCheckout.py
index 1b7baa0..a2cd5c6 100644
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/plugins/DefaultArtifactCheckout.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/plugins/DefaultArtifactCheckout.py
@@ -95,7 +95,8 @@ class DefaultArtifactCheckout(IArtifactCheckoutPlugin):
self.log.info("Executing git clone: [tenant-id] %s [repo-url] %s, [repo path] %s",
git_repo.tenant_id, git_repo.repo_url, git_repo.local_repo_path)
- self.check_and_backup_initial_artifacts(git_repo.local_repo_path)
+ if not Config.backup_initial_artifacts is None and Config.backup_initial_artifacts:
+ self.check_and_backup_initial_artifacts(git_repo.local_repo_path)
try:
git_repo = AgentGitHandler.clone(git_repo)