You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ignite.apache.org by GitBox <gi...@apache.org> on 2021/04/15 13:17:43 UTC
[GitHub] [ignite] map7000 opened a new pull request #9008: Ignite 14520
map7000 opened a new pull request #9008:
URL: https://github.com/apache/ignite/pull/9008
Thank you for submitting the pull request to the Apache Ignite.
In order to streamline the review of the contribution
we ask you to ensure the following steps have been taken:
### The Contribution Checklist
- [ ] There is a single JIRA ticket related to the pull request.
- [ ] The web-link to the pull request is attached to the JIRA ticket.
- [ ] The JIRA ticket has the _Patch Available_ state.
- [ ] The pull request body describes changes that have been made.
The description explains _WHAT_ and _WHY_ was made instead of _HOW_.
- [ ] The pull request title is treated as the final commit message.
The following pattern must be used: `IGNITE-XXXX Change summary` where `XXXX` - number of JIRA issue.
- [ ] A reviewer has been mentioned through the JIRA comments
(see [the Maintainers list](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute#HowtoContribute-ReviewProcessandMaintainers))
- [ ] The pull request has been checked by the Teamcity Bot and
the `green visa` attached to the JIRA ticket (see [TC.Bot: Check PR](https://mtcga.gridgain.com/prs.html))
### Notes
- [How to Contribute](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute)
- [Coding abbreviation rules](https://cwiki.apache.org/confluence/display/IGNITE/Abbreviation+Rules)
- [Coding Guidelines](https://cwiki.apache.org/confluence/display/IGNITE/Coding+Guidelines)
- [Apache Ignite Teamcity Bot](https://cwiki.apache.org/confluence/display/IGNITE/Apache+Ignite+Teamcity+Bot)
If you need any help, please email dev@ignite.apache.org or ask anу advice on http://asf.slack.com _#ignite_ channel.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] nizhikov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
nizhikov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r617652535
##########
File path: modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
##########
@@ -172,6 +172,7 @@ def init_persistent(self, node):
def _prepare_configs(self, node):
config = self.config.prepare_for_env(test_globals=self.globals, node=node, cluster=self)
+ config = self.spec.extend_config(test_globals=self.globals, node=node, cluster=self)
Review comment:
We should have config as parameter of `extend_config` method, also.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] nizhikov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
nizhikov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r622928164
##########
File path: modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
##########
@@ -190,9 +190,11 @@ def init_shared(self, node):
node.account.copy_to(os.path.join(local_shared_dir, file), self.shared_root)
def _prepare_configs(self, node):
- config = self.config.prepare_for_env(self.globals, self.shared_root, node, self)
+ config = self.spec \
+ .extend_config(self.config, self.globals, node, self) \
+ .prepare_for_env(self.globals, self.shared_root, node, self)
Review comment:
Yes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] nizhikov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
nizhikov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r616418706
##########
File path: modules/ducktests/tests/ignitetest/services/utils/templates/misc_macro.j2
##########
@@ -22,3 +22,25 @@
<property name="activeOnStart" value="{{ 'false' if state == 'INACTIVE' else 'true'}}"/>
{% endif %}
{% endmacro %}
+
+{% macro plugins(config) %}
+ {% if config.plugins %}
+ <property name="pluginProviders">
+ <list>
+ {% for plugin in config.plugins %}
Review comment:
Please, fix indentation here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] nizhikov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
nizhikov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r617651842
##########
File path: modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
##########
@@ -172,6 +172,7 @@ def init_persistent(self, node):
def _prepare_configs(self, node):
config = self.config.prepare_for_env(test_globals=self.globals, node=node, cluster=self)
+ config = self.spec.extend_config(test_globals=self.globals, node=node, cluster=self)
Review comment:
This should be executed **before** prepare_for_env.
globals should have higher priority than spec.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] nizhikov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
nizhikov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r617652846
##########
File path: modules/ducktests/tests/ignitetest/services/utils/ignite_spec.py
##########
@@ -99,6 +99,12 @@ def config_templates(self):
return config_templates
+ def extend_config(self, test_globals, node, cluster):
+ """
+ Extend config with custom variables
+ """
+ return self.config.prepare_for_env(test_globals=test_globals, node=node, cluster=cluster)
Review comment:
This method should be empty by default.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] anton-vinogradov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
anton-vinogradov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r622929814
##########
File path: modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
##########
@@ -190,9 +190,11 @@ def init_shared(self, node):
node.account.copy_to(os.path.join(local_shared_dir, file), self.shared_root)
def _prepare_configs(self, node):
- config = self.config.prepare_for_env(self.globals, self.shared_root, node, self)
+ config = self.spec \
+ .extend_config(self.config, self.globals, node, self) \
Review comment:
This looks odd to pass X and X.Y.
This means we have an architectural issue here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] nizhikov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
nizhikov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r622927998
##########
File path: modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
##########
@@ -190,9 +190,11 @@ def init_shared(self, node):
node.account.copy_to(os.path.join(local_shared_dir, file), self.shared_root)
def _prepare_configs(self, node):
- config = self.config.prepare_for_env(self.globals, self.shared_root, node, self)
+ config = self.spec \
+ .extend_config(self.config, self.globals, node, self) \
Review comment:
I think we should keep `config`, also.
Because, this function extends specific config.
So, we can combine, `self` and `self.globals`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] nizhikov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
nizhikov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r622945807
##########
File path: modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
##########
@@ -190,9 +190,11 @@ def init_shared(self, node):
node.account.copy_to(os.path.join(local_shared_dir, file), self.shared_root)
def _prepare_configs(self, node):
- config = self.config.prepare_for_env(self.globals, self.shared_root, node, self)
+ config = self.spec \
+ .extend_config(self.config, self.globals, node, self) \
Review comment:
I just want to extend explicit config, not implicit one available from `self` variable.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] anton-vinogradov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
anton-vinogradov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r622882923
##########
File path: modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
##########
@@ -190,9 +190,11 @@ def init_shared(self, node):
node.account.copy_to(os.path.join(local_shared_dir, file), self.shared_root)
def _prepare_configs(self, node):
- config = self.config.prepare_for_env(self.globals, self.shared_root, node, self)
+ config = self.spec \
+ .extend_config(self.config, self.globals, node, self) \
+ .prepare_for_env(self.globals, self.shared_root, node, self)
Review comment:
how about passing only `self` and `node` here?
##########
File path: modules/ducktests/tests/ignitetest/services/utils/templates/ignite.xml.j2
##########
@@ -93,9 +95,41 @@
{% if config.client_connector_configuration %}
<property name="clientConnectorConfiguration">
<bean class="org.apache.ignite.configuration.ClientConnectorConfiguration">
- <property name="port" value="{{ config.client_connector_configuration.port }}"/>
+ <property name="port" value="{{ config.client_connector_configuration.port }}"/>
+ <property name="sslEnabled" value="{{ config.client_connector_configuration.ssl_enabled }}"/>
+ {% if config.client_connector_configuration.ssl_enabled %}
Review comment:
any reason to have `<property name="sslEnabled" value="false"` when !ssl_enabled?
##########
File path: modules/ducktests/tests/docker/ducker-ignite
##########
@@ -479,6 +479,11 @@ ducker_test() {
must_pushd "${ignite_dir}"
#(test mvn) && mvn package -DskipTests -Dmaven.javadoc.skip=true -Plgpl,-examples,-clean-libs,-release,-scala,-clientDocs
must_popd
+ if [[ -n "${DUCKTAPE_EXTRA_SETUP}" ]]; then
+ echo "execing extra ducktape setup with '${DUCKTAPE_EXTRA_SETUP}'"
Review comment:
executing?
##########
File path: modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
##########
@@ -190,9 +190,11 @@ def init_shared(self, node):
node.account.copy_to(os.path.join(local_shared_dir, file), self.shared_root)
def _prepare_configs(self, node):
- config = self.config.prepare_for_env(self.globals, self.shared_root, node, self)
+ config = self.spec \
+ .extend_config(self.config, self.globals, node, self) \
Review comment:
seems you may pass only `self`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] nizhikov merged pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
nizhikov merged pull request #9008:
URL: https://github.com/apache/ignite/pull/9008
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] nizhikov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
nizhikov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r616418353
##########
File path: modules/ducktests/tests/ignitetest/services/utils/templates/ignite.xml.j2
##########
@@ -93,9 +95,43 @@
{% if config.client_connector_configuration %}
<property name="clientConnectorConfiguration">
<bean class="org.apache.ignite.configuration.ClientConnectorConfiguration">
- <property name="port" value="{{ config.client_connector_configuration.port }}"/>
+ <property name="port" value="{{ config.client_connector_configuration.port }}"/>
+ <property name="sslEnabled" value="{{ config.client_connector_configuration.ssl_enabled }}"/>
+ {% if config.client_connector_configuration.ssl_enabled %}
+ <property name="sslContextFactory">
+ {{ ssl_params_util.ssl_params(config.client_connector_configuration.ssl_params) }}
+ </property>
+ <property name="useIgniteSslContextFactory" value="{{ config.client_connector_configuration.use_ignite_ssl_context_factory }}"/>
+ <property name="sslClientAuth" value="{{ config.client_connector_configuration.ssl_client_auth }}"/>
+ {% endif %}
</bean>
</property>
{% endif %}
+
+ {% if config.binary_configuration %}
+ <property name="binaryConfiguration">
Review comment:
Please, fix indentation here.
##########
File path: modules/ducktests/tests/ignitetest/services/utils/templates/ignite.xml.j2
##########
@@ -93,9 +95,43 @@
{% if config.client_connector_configuration %}
<property name="clientConnectorConfiguration">
<bean class="org.apache.ignite.configuration.ClientConnectorConfiguration">
- <property name="port" value="{{ config.client_connector_configuration.port }}"/>
+ <property name="port" value="{{ config.client_connector_configuration.port }}"/>
+ <property name="sslEnabled" value="{{ config.client_connector_configuration.ssl_enabled }}"/>
+ {% if config.client_connector_configuration.ssl_enabled %}
+ <property name="sslContextFactory">
Review comment:
Please, fix indentation here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] nizhikov commented on a change in pull request #9008: IGNITE-14520 Plugins support in Ignite configuration
Posted by GitBox <gi...@apache.org>.
nizhikov commented on a change in pull request #9008:
URL: https://github.com/apache/ignite/pull/9008#discussion_r617657874
##########
File path: modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
##########
@@ -172,6 +172,7 @@ def init_persistent(self, node):
def _prepare_configs(self, node):
config = self.config.prepare_for_env(test_globals=self.globals, node=node, cluster=self)
Review comment:
For now, this line useless.
We should have config as a parameter of the extend_config method.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org