[Engine-patches] Change in ovirt-engine[master]: aaa: Move GlobalContext to InvokeKeys

[yzaslavs]

Yair Zaslavsky has uploaded a new change for review.

Change subject: aaa: Move GlobalContext to InvokeKeys
......................................................................

aaa: Move GlobalContext to InvokeKeys

This fixes the issue of stackoverflow error when changing
debug level for logging

Change-Id: If4735d01668ab38d8686964d4a335fcbce7776fe
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M 
backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java
M 
backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
M 
backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
3 files changed, 8 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/27953/1

diff --git 
a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java
 
b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java
index 39433b0..38ffd25 100644
--- 
a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java
+++ 
b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java
@@ -178,8 +178,6 @@
      * Context keys.
      */
     public static class ContextKeys {
-        /** Global context. */
-        public static final ExtKey GLOBAL_CONTEXT = new 
ExtKey("EXTENSION_GLOBAL_CONTEXT", ExtMap.class, 
"9799e72f-7af6-4cf1-bf08-297bc8903676");
         /** Minimum usable interface version. */
         public static final ExtKey INTERFACE_VERSION_MIN = new 
ExtKey("EXTENSION_INTERFACE_VERSION_MIN", Integer.class, 
"2b84fc91-305b-497b-a1d7-d961b9d2ce0b");
         /** Maximum usable interface version. */
@@ -260,6 +258,8 @@
         public static final ExtKey LOCALE = new 
ExtKey("EXTENSION_INVOKE_LOCALE", String.class, 
"f9cebeec-43ac-4420-ae7d-1777473f1947");
         /** Command to execute. */
         public static final ExtKey COMMAND = new 
ExtKey("EXTENSION_INVOKE_COMMAND", ExtUUID.class, 
"485778ab-bede-4f1a-b823-77b262a2f28d");
+        /** Global context. */
+        public static final ExtKey GLOBAL_CONTEXT = new 
ExtKey("EXTENSION_INVOKE_GLOBAL_CONTEXT", ExtMap.class, 
"9799e72f-7af6-4cf1-bf08-297bc8903676");
         /**
          * Invoke result, set by extension.
          * @see InvokeResult
diff --git 
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
 
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
index e63e315..8f39c2e 100644
--- 
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
+++ 
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
@@ -10,6 +10,7 @@
 
     private Extension proxied;
     private ExtMap context;
+    private ExtMap globalContext;
 
     private void dumpMap(String prefix, ExtMap map) {
         Log logger = context.<Log> 
get(ExtensionsManager.TRACE_LOG_CONTEXT_KEY);
@@ -20,9 +21,10 @@
         }
     }
 
-    public ExtensionProxy(Extension proxied, ExtMap context) {
+    public ExtensionProxy(Extension proxied, ExtMap context, ExtMap 
globalContext) {
         this.proxied = proxied;
         this.context = context;
+        this.globalContext = context;
     }
 
     public Extension getExtension() {
@@ -36,6 +38,7 @@
     @Override
     public void invoke(ExtMap input, ExtMap output) {
         input.putIfAbsent(Base.InvokeKeys.CONTEXT, context);
+        input.putIfAbsent(Base.InvokeKeys.GLOBAL_CONTEXT, globalContext);
 
         dumpMap("Invoke Input", input);
         try {
diff --git 
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
 
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
index 3d391cb..2383a99 100644
--- 
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
+++ 
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
@@ -181,9 +181,6 @@
                     loadExtension(props),
                     (
                     new ExtMap().mput(
-                            Base.ContextKeys.GLOBAL_CONTEXT,
-                            globalContext
-                            ).mput(
                                     TRACE_LOG_CONTEXT_KEY,
                                     traceLog
                             ).mput(
@@ -208,7 +205,8 @@
                             Base.ContextKeys.PROVIDES,
                             
splitString(props.getProperty(Base.ConfigKeys.PROVIDES, ""))
                             )
-                    )
+                    ),
+                    globalContext
             );
             ExtMap output = entry.extension.invoke(
                     new ExtMap().mput(


-- 
To view, visit http://gerrit.ovirt.org/27953
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4735d01668ab38d8686964d4a335fcbce7776fe
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches