You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2020/08/30 17:31:33 UTC
[ranger] branch ranger-2.1 updated (a53a891 -> 5ec9fbd)
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a change to branch ranger-2.1
in repository https://gitbox.apache.org/repos/asf/ranger.git.
from a53a891 RANGER-2974: Docker setup to run Ranger enabled Kafka
new 5e3655e RANGER-2974: updated docker setup README.md
new c5e613c RANGER-2979: fix for NPE in unit-test
new 2178ebd RANGER-2980: updated packaging to generate .tar.gz archives only
new 5ec9fbd RANGER-2978: Ranger upgrade fails due to missing DB function
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-support/ranger-docker/README.md | 52 +++++++++++++---------
distro/src/main/assembly/admin-web.xml | 1 -
distro/src/main/assembly/hbase-agent.xml | 1 -
distro/src/main/assembly/hdfs-agent.xml | 1 -
distro/src/main/assembly/hive-agent.xml | 1 -
distro/src/main/assembly/kms.xml | 1 -
distro/src/main/assembly/knox-agent.xml | 1 -
distro/src/main/assembly/migration-util.xml | 1 -
distro/src/main/assembly/plugin-atlas.xml | 1 -
distro/src/main/assembly/plugin-elasticsearch.xml | 1 -
distro/src/main/assembly/plugin-kafka.xml | 1 -
distro/src/main/assembly/plugin-kms.xml | 1 -
distro/src/main/assembly/plugin-kylin.xml | 1 -
distro/src/main/assembly/plugin-ozone.xml | 1 -
distro/src/main/assembly/plugin-presto.xml | 1 -
distro/src/main/assembly/plugin-solr.xml | 1 -
distro/src/main/assembly/plugin-sqoop.xml | 1 -
distro/src/main/assembly/plugin-yarn.xml | 1 -
distro/src/main/assembly/ranger-src.xml | 1 -
distro/src/main/assembly/ranger-tools.xml | 1 -
distro/src/main/assembly/solr_audit_conf.xml | 1 -
distro/src/main/assembly/storm-agent.xml | 1 -
distro/src/main/assembly/tagsync.xml | 1 -
distro/src/main/assembly/usersync.xml | 1 -
.../hive/authorizer/RangerHiveAuthorizer.java | 8 +++-
...6-insert-statename-in-x-ranger-global-state.sql | 10 +++++
...6-insert-statename-in-x-ranger-global-state.sql | 11 +++++
...6-insert-statename-in-x-ranger-global-state.sql | 4 ++
...6-insert-statename-in-x-ranger-global-state.sql | 9 ++++
...6-insert-statename-in-x-ranger-global-state.sql | 34 ++++++++++++++
30 files changed, 107 insertions(+), 44 deletions(-)
[ranger] 03/04: RANGER-2980: updated packaging to generate .tar.gz
archives only
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.1
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 2178ebd53c22d879e66f2f11d7d06cc41f73c9b6
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Sat Aug 29 12:00:54 2020 -0700
RANGER-2980: updated packaging to generate .tar.gz archives only
(cherry picked from commit 0c55a7b4b092a50cbbec6cbd966d174ee1b6886e)
---
distro/src/main/assembly/admin-web.xml | 1 -
distro/src/main/assembly/hbase-agent.xml | 1 -
distro/src/main/assembly/hdfs-agent.xml | 1 -
distro/src/main/assembly/hive-agent.xml | 1 -
distro/src/main/assembly/kms.xml | 1 -
distro/src/main/assembly/knox-agent.xml | 1 -
distro/src/main/assembly/migration-util.xml | 1 -
distro/src/main/assembly/plugin-atlas.xml | 1 -
distro/src/main/assembly/plugin-elasticsearch.xml | 1 -
distro/src/main/assembly/plugin-kafka.xml | 1 -
distro/src/main/assembly/plugin-kms.xml | 1 -
distro/src/main/assembly/plugin-kylin.xml | 1 -
distro/src/main/assembly/plugin-ozone.xml | 1 -
distro/src/main/assembly/plugin-presto.xml | 1 -
distro/src/main/assembly/plugin-solr.xml | 1 -
distro/src/main/assembly/plugin-sqoop.xml | 1 -
distro/src/main/assembly/plugin-yarn.xml | 1 -
distro/src/main/assembly/ranger-src.xml | 1 -
distro/src/main/assembly/ranger-tools.xml | 1 -
distro/src/main/assembly/solr_audit_conf.xml | 1 -
distro/src/main/assembly/storm-agent.xml | 1 -
distro/src/main/assembly/tagsync.xml | 1 -
distro/src/main/assembly/usersync.xml | 1 -
23 files changed, 23 deletions(-)
diff --git a/distro/src/main/assembly/admin-web.xml b/distro/src/main/assembly/admin-web.xml
index 0c47d0d..3776563 100644
--- a/distro/src/main/assembly/admin-web.xml
+++ b/distro/src/main/assembly/admin-web.xml
@@ -19,7 +19,6 @@
<id>admin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-admin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/hbase-agent.xml b/distro/src/main/assembly/hbase-agent.xml
index 88220b3..2a1d0b4 100644
--- a/distro/src/main/assembly/hbase-agent.xml
+++ b/distro/src/main/assembly/hbase-agent.xml
@@ -19,7 +19,6 @@
<id>hbase-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-hbase-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/hdfs-agent.xml b/distro/src/main/assembly/hdfs-agent.xml
index 371f0a6..7d24dd8 100644
--- a/distro/src/main/assembly/hdfs-agent.xml
+++ b/distro/src/main/assembly/hdfs-agent.xml
@@ -19,7 +19,6 @@
<id>hdfs-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-hdfs-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/hive-agent.xml b/distro/src/main/assembly/hive-agent.xml
index 3396504..8878e01 100644
--- a/distro/src/main/assembly/hive-agent.xml
+++ b/distro/src/main/assembly/hive-agent.xml
@@ -19,7 +19,6 @@
<id>hive-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-hive-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
index ccc39a5..2c68d6a 100755
--- a/distro/src/main/assembly/kms.xml
+++ b/distro/src/main/assembly/kms.xml
@@ -19,7 +19,6 @@
<id>kms</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-kms</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/knox-agent.xml b/distro/src/main/assembly/knox-agent.xml
index 79856e9..0532e5a 100644
--- a/distro/src/main/assembly/knox-agent.xml
+++ b/distro/src/main/assembly/knox-agent.xml
@@ -19,7 +19,6 @@
<id>knox-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-knox-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/migration-util.xml b/distro/src/main/assembly/migration-util.xml
index 4c723b8..f3780e2 100644
--- a/distro/src/main/assembly/migration-util.xml
+++ b/distro/src/main/assembly/migration-util.xml
@@ -19,7 +19,6 @@
<id>migration-util</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-migration-util</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/plugin-atlas.xml b/distro/src/main/assembly/plugin-atlas.xml
index 62114c6..f49db48 100644
--- a/distro/src/main/assembly/plugin-atlas.xml
+++ b/distro/src/main/assembly/plugin-atlas.xml
@@ -19,7 +19,6 @@
<id>atlas-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-atlas-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/plugin-elasticsearch.xml b/distro/src/main/assembly/plugin-elasticsearch.xml
index 6a57410..1d224ca 100644
--- a/distro/src/main/assembly/plugin-elasticsearch.xml
+++ b/distro/src/main/assembly/plugin-elasticsearch.xml
@@ -19,7 +19,6 @@
<id>elasticsearch-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-elasticsearch-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/plugin-kafka.xml b/distro/src/main/assembly/plugin-kafka.xml
index 4298088..7bb7699 100644
--- a/distro/src/main/assembly/plugin-kafka.xml
+++ b/distro/src/main/assembly/plugin-kafka.xml
@@ -14,7 +14,6 @@
<id>kafka-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-kafka-plugin
</baseDirectory>
diff --git a/distro/src/main/assembly/plugin-kms.xml b/distro/src/main/assembly/plugin-kms.xml
index c3738ce..46bd6a5 100755
--- a/distro/src/main/assembly/plugin-kms.xml
+++ b/distro/src/main/assembly/plugin-kms.xml
@@ -19,7 +19,6 @@
<id>kms-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-kms-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/plugin-kylin.xml b/distro/src/main/assembly/plugin-kylin.xml
index c0885c2..bf88151 100644
--- a/distro/src/main/assembly/plugin-kylin.xml
+++ b/distro/src/main/assembly/plugin-kylin.xml
@@ -19,7 +19,6 @@
<id>kylin-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-kylin-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/plugin-ozone.xml b/distro/src/main/assembly/plugin-ozone.xml
index 62a31ff..fb4cdd1 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -19,7 +19,6 @@
<id>ozone-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-ozone-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/plugin-presto.xml b/distro/src/main/assembly/plugin-presto.xml
index 4f11978..09de1ad 100644
--- a/distro/src/main/assembly/plugin-presto.xml
+++ b/distro/src/main/assembly/plugin-presto.xml
@@ -19,7 +19,6 @@
<id>presto-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-presto-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/plugin-solr.xml b/distro/src/main/assembly/plugin-solr.xml
index 91f7bfe..c819ce3 100644
--- a/distro/src/main/assembly/plugin-solr.xml
+++ b/distro/src/main/assembly/plugin-solr.xml
@@ -13,7 +13,6 @@
<id>solr-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-solr-plugin
</baseDirectory>
diff --git a/distro/src/main/assembly/plugin-sqoop.xml b/distro/src/main/assembly/plugin-sqoop.xml
index af18811..af47dc8 100644
--- a/distro/src/main/assembly/plugin-sqoop.xml
+++ b/distro/src/main/assembly/plugin-sqoop.xml
@@ -19,7 +19,6 @@
<id>sqoop-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-sqoop-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/plugin-yarn.xml b/distro/src/main/assembly/plugin-yarn.xml
index f9f3104..14f8864 100644
--- a/distro/src/main/assembly/plugin-yarn.xml
+++ b/distro/src/main/assembly/plugin-yarn.xml
@@ -19,7 +19,6 @@
<id>yarn-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-yarn-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/ranger-src.xml b/distro/src/main/assembly/ranger-src.xml
index 4cd36fa..f361b2e 100644
--- a/distro/src/main/assembly/ranger-src.xml
+++ b/distro/src/main/assembly/ranger-src.xml
@@ -19,7 +19,6 @@
<id>src</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-src</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/ranger-tools.xml b/distro/src/main/assembly/ranger-tools.xml
index 26e632c..09dc97b 100644
--- a/distro/src/main/assembly/ranger-tools.xml
+++ b/distro/src/main/assembly/ranger-tools.xml
@@ -19,7 +19,6 @@
<id>ranger-tools</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-ranger-tools</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/solr_audit_conf.xml b/distro/src/main/assembly/solr_audit_conf.xml
index e3e618c..2a4b79e 100644
--- a/distro/src/main/assembly/solr_audit_conf.xml
+++ b/distro/src/main/assembly/solr_audit_conf.xml
@@ -19,7 +19,6 @@
<id>solr_audit_conf</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
diff --git a/distro/src/main/assembly/storm-agent.xml b/distro/src/main/assembly/storm-agent.xml
index ddbb60e..820b34d 100644
--- a/distro/src/main/assembly/storm-agent.xml
+++ b/distro/src/main/assembly/storm-agent.xml
@@ -19,7 +19,6 @@
<id>storm-plugin</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-storm-plugin</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/tagsync.xml b/distro/src/main/assembly/tagsync.xml
index 2400cd5..1abb2d5 100644
--- a/distro/src/main/assembly/tagsync.xml
+++ b/distro/src/main/assembly/tagsync.xml
@@ -19,7 +19,6 @@
<id>tagsync</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-tagsync</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
diff --git a/distro/src/main/assembly/usersync.xml b/distro/src/main/assembly/usersync.xml
index 3193bc6..8d66c38 100644
--- a/distro/src/main/assembly/usersync.xml
+++ b/distro/src/main/assembly/usersync.xml
@@ -19,7 +19,6 @@
<id>usersync</id>
<formats>
<format>tar.gz</format>
- <format>zip</format>
</formats>
<baseDirectory>${project.parent.name}-${project.version}-usersync</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
[ranger] 04/04: RANGER-2978: Ranger upgrade fails due to missing DB
function
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.1
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 5ec9fbd0b78595084dc847f7fdc9da0506f6c482
Author: Dhaval B. Shah <dh...@gmail.com>
AuthorDate: Fri Aug 28 23:02:49 2020 +0530
RANGER-2978: Ranger upgrade fails due to missing DB function
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
(cherry picked from commit f754f832fefb2d04053b37dc02024ea251d052cf)
---
...6-insert-statename-in-x-ranger-global-state.sql | 10 +++++++
...6-insert-statename-in-x-ranger-global-state.sql | 11 +++++++
...6-insert-statename-in-x-ranger-global-state.sql | 4 +++
...6-insert-statename-in-x-ranger-global-state.sql | 9 ++++++
...6-insert-statename-in-x-ranger-global-state.sql | 34 ++++++++++++++++++++++
5 files changed, 68 insertions(+)
diff --git a/security-admin/db/mysql/patches/046-insert-statename-in-x-ranger-global-state.sql b/security-admin/db/mysql/patches/046-insert-statename-in-x-ranger-global-state.sql
index cdc0aa6..d9cc650 100644
--- a/security-admin/db/mysql/patches/046-insert-statename-in-x-ranger-global-state.sql
+++ b/security-admin/db/mysql/patches/046-insert-statename-in-x-ranger-global-state.sql
@@ -13,6 +13,16 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
+DELIMITER $$
+DROP FUNCTION if exists getXportalUIdByLoginId$$
+CREATE FUNCTION `getXportalUIdByLoginId`(input_val VARCHAR(100)) RETURNS int(11)
+BEGIN DECLARE myid INT; SELECT x_portal_user.id into myid FROM x_portal_user
+WHERE x_portal_user.login_id = input_val;
+RETURN myid;
+END $$
+
+DELIMITER ;
+
drop procedure if exists insert_statename_in_x_ranger_global_state;
delimiter ;;
diff --git a/security-admin/db/oracle/patches/046-insert-statename-in-x-ranger-global-state.sql b/security-admin/db/oracle/patches/046-insert-statename-in-x-ranger-global-state.sql
index 89c781d..ad8eaab 100644
--- a/security-admin/db/oracle/patches/046-insert-statename-in-x-ranger-global-state.sql
+++ b/security-admin/db/oracle/patches/046-insert-statename-in-x-ranger-global-state.sql
@@ -13,6 +13,17 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
+CREATE OR REPLACE FUNCTION getXportalUIdByLoginId(input_val IN VARCHAR2)
+RETURN NUMBER iS
+BEGIN
+DECLARE
+myid Number := 0;
+begin
+ SELECT x_portal_user.id into myid FROM x_portal_user
+ WHERE x_portal_user.login_id=input_val;
+ RETURN myid;
+end;
+END;/
DECLARE
t_count number:=0;
diff --git a/security-admin/db/postgres/patches/046-insert-statename-in-x-ranger-global-state.sql b/security-admin/db/postgres/patches/046-insert-statename-in-x-ranger-global-state.sql
index b8b29ee..75eb97e 100644
--- a/security-admin/db/postgres/patches/046-insert-statename-in-x-ranger-global-state.sql
+++ b/security-admin/db/postgres/patches/046-insert-statename-in-x-ranger-global-state.sql
@@ -13,6 +13,10 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
+CREATE OR REPLACE FUNCTION getXportalUIdByLoginId(input_val varchar(100))
+RETURNS bigint LANGUAGE SQL AS $$ SELECT x_portal_user.id FROM x_portal_user
+WHERE x_portal_user.login_id = $1; $$;
+
select 'delimiter start';
CREATE OR REPLACE FUNCTION insert_statename_in_x_ranger_global_state()
RETURNS void AS $$
diff --git a/security-admin/db/sqlanywhere/patches/046-insert-statename-in-x-ranger-global-state.sql b/security-admin/db/sqlanywhere/patches/046-insert-statename-in-x-ranger-global-state.sql
index d81feca..8c852de 100644
--- a/security-admin/db/sqlanywhere/patches/046-insert-statename-in-x-ranger-global-state.sql
+++ b/security-admin/db/sqlanywhere/patches/046-insert-statename-in-x-ranger-global-state.sql
@@ -13,6 +13,15 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
+CREATE OR REPLACE FUNCTION dbo.getXportalUIdByLoginId (input_val CHAR(60))
+RETURNS INTEGER
+BEGIN
+ DECLARE myid INTEGER;
+ SELECT x_portal_user.id into myid FROM x_portal_user WHERE x_portal_user.login_id=input_val;
+ RETURN (myid);
+END;
+GO
+
BEGIN
IF EXISTS(select * from SYS.SYSCOLUMNS where tname = 'x_ranger_global_state' and cname='state_name') THEN
diff --git a/security-admin/db/sqlserver/patches/046-insert-statename-in-x-ranger-global-state.sql b/security-admin/db/sqlserver/patches/046-insert-statename-in-x-ranger-global-state.sql
index d76254b..9df8e59 100644
--- a/security-admin/db/sqlserver/patches/046-insert-statename-in-x-ranger-global-state.sql
+++ b/security-admin/db/sqlserver/patches/046-insert-statename-in-x-ranger-global-state.sql
@@ -12,6 +12,40 @@
-- 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.
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+IF EXISTS (SELECT *
+ FROM sys.objects
+ WHERE object_id = OBJECT_ID(N'dbo.getXportalUIdByLoginId')
+ AND type IN ( N'FN', N'IF', N'TF', N'FS', N'FT' ))
+ DROP FUNCTION dbo.getXportalUIdByLoginId
+ PRINT 'Dropped function dbo.getXportalUIdByLoginId'
+
+GO
+PRINT 'Creating function dbo.getXportalUIdByLoginId'
+GO
+CREATE FUNCTION dbo.getXportalUIdByLoginId
+(
+
+ @inputValue varchar(200)
+)
+RETURNS int
+AS
+BEGIN
+ Declare @myid int;
+
+ Select @myid = id from x_portal_user where x_portal_user.login_id = @inputValue;
+
+ return @myid;
+
+END
+GO
+
+PRINT 'Created function dbo.getXportalUIdByLoginId successfully'
+GO
+
GO
IF EXISTS(select * from INFORMATION_SCHEMA.columns where table_name = 'x_ranger_global_state' and column_name = 'state_name')
[ranger] 01/04: RANGER-2974: updated docker setup README.md
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.1
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 5e3655ef3bf904bb9da34c79d7f93341c167c1c4
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Sat Aug 29 11:08:22 2020 -0700
RANGER-2974: updated docker setup README.md
(cherry picked from commit 429338a3d6f1454e8215a1ed838b34020a3a3815)
---
dev-support/ranger-docker/README.md | 52 +++++++++++++++++++++++--------------
1 file changed, 32 insertions(+), 20 deletions(-)
diff --git a/dev-support/ranger-docker/README.md b/dev-support/ranger-docker/README.md
index 483da70..3f82db6 100644
--- a/dev-support/ranger-docker/README.md
+++ b/dev-support/ranger-docker/README.md
@@ -19,90 +19,102 @@ under the License.
## Overview
-Docker files in this folder create docker images to build Apache Ranger and
-deploy Apache Ranger and its dependent services in containers.
+Docker files in this folder create docker images and run them to build Apache Ranger, deploy Apache Ranger and dependent services in containers.
## Usage
-1. Ensure that you have a recent version of Docker installed from
- [docker.io](http://www.docker.io).
-
+1. Ensure that you have recent version of Docker installed from [docker.io](http://www.docker.io) (as of this writing: Engine 19.03, Compose 1.26.2).
2. Set this folder as your working directory.
+3. Using docker-compose is the simpler way to build and deploy Apache Ranger in containers.
-3. Using docker-compose is the simpler way to build and deploy Apache Ranger
- in containers.
3.1. Execute following command to build Apache Ranger:
+
docker-compose -f docker-compose.ranger-base.yml -f docker-compose.ranger-build.yml up --remove-orphans
- Time taken to complete the build might vary (upto an hour), depending on
- status of ${HOME}/.m2 directory cache.
+ Time taken to complete the build might vary (upto an hour), depending on status of ${HOME}/.m2 directory cache.
+
+ 3.2. Execute following command to start Ranger, Ranger enabled HDFS/YARN/HBase/Kafka and dependent services (Solr, DB) in containers:
- 3.2. Execute following command to start Ranger, Ranger enabled HDFS, Ranger enabled HBase, and dependeny services (Solr, DB) in continers:
docker-compose -f docker-compose.ranger-base.yml -f docker-compose.ranger.yml -f docker-compose.ranger-hadoop.yml -f docker-compose.ranger-hbase.yml -f docker-compose.ranger-kafka.yml up -d
4. Alternatively docker command can be used to build and deploy Apache Ranger.
+
4.1. Execute following command to build Docker image **ranger-base**:
+
docker build -f Dockerfile.ranger-base -t ranger-base .
- This might take about 10 minutes to complete.
+ This might take about 10 minutes to complete.
4.2. Execute following command to build Docker image **ranger-build**:
+
docker build -f Dockerfile.ranger-build -t ranger-build .
4.3. Build Apache Ranger in a container with the following command:
+
docker run -it --rm -v ${HOME}/.m2:/home/ranger/.m2 -v $(pwd)/dist:/home/ranger/dist -e BRANCH=ranger-2.1 -e PROFILE=all -e SKIPTESTS=true ranger-build
- Time taken to complete the build might vary (upto an hour), depending on status of ${HOME}/.m2 directory cache.
+ Time taken to complete the build might vary (upto an hour), depending on status of ${HOME}/.m2 directory cache.
4.4. Execute following command to build Docker image **ranger**:
+
docker build -f Dockerfile.ranger -t ranger .
- This might take about 10 minutes to complete.
+ This might take about 10 minutes to complete.
4.5. Execute following command to build a Docker image **ranger-solr**:
+
docker build -f Dockerfile.ranger-solr -t ranger-solr .
4.6. Execute following command to start a container that runs database for use by Ranger Admin:
+
docker run --name ranger-db --hostname ranger-db.example.com -e POSTGRES_PASSWORD='rangerR0cks!' -d postgres:12
4.7. Execute following command to start a container that runs Solr for use by Ranger Admin:
+
docker run --name ranger-solr --hostname ranger-solr.example.com -p 8983:8983 -d ranger-solr solr-precreate ranger_audits /opt/solr/server/solr/configsets/ranger_audits/
4.8. Execute following command to install and run Ranger services in a container:
+
docker run -it -d --name ranger --hostname ranger.example.com -p 6080:6080 --link ranger-db:ranger-db --link ranger-solr:ranger-solr ranger
- This might take few minutes to complete.
+ This might take few minutes to complete.
4.9. Execute following command to build Docker image **ranger-hadoop**:
+
docker build -f Dockerfile.ranger-hadoop -t ranger-hadoop .
- This step includes downloading of Hadoop tar balls, and can take a while to complete.
+ This step includes downloading of Hadoop tar balls, and can take a while to complete.
4.10. Execute following command to install and run Ranger enabled HDFS in a container:
+
docker run -it -d --name ranger-hadoop --hostname ranger-hadoop.example.com -p 9000:9000 -p 8088:8088 --link ranger:ranger --link ranger-solr:ranger-solr ranger-hadoop
- This might take few minutes to complete.
+ This might take few minutes to complete.
4.11. Execute following command to build Docker image **ranger-hbase**:
+
docker build -f Dockerfile.ranger-hbase -t ranger-hbase .
- This step includes downloading of HBase tar ball, and can take a while to complete.
+ This step includes downloading of HBase tar ball, and can take a while to complete.
4.12. Execute following command to install and run Ranger enabled HBase in a container:
+
docker run -it -d --name ranger-hbase --hostname ranger-hbase.example.com --link ranger-hadoop:ranger-hadoop --link ranger:ranger --link ranger-solr:ranger-solr ranger-hbase
- This might take few minutes to complete.
+ This might take few minutes to complete.
4.13. Execute following command to build Docker image **ranger-kafka**:
+
docker build -f Dockerfile.ranger-kafka -t ranger-kafka .
- This step includes downloading of Kafka tar ball, and can take a while to complete.
+ This step includes downloading of Kafka tar ball, and can take a while to complete.
4.12. Execute following command to install and run Ranger enabled Kafka in a container:
+
docker run -it -d --name ranger-kafka --hostname ranger-kafka.example.com --link ranger-hadoop:ranger-hadoop --link ranger:ranger --link ranger-solr:ranger-solr ranger-kafka
- This might take few minutes to complete.
+ This might take few minutes to complete.
5. Ranger Admin can be accessed at http://localhost:6080 (admin/rangerR0cks!)
[ranger] 02/04: RANGER-2979: fix for NPE in unit-test
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.1
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit c5e613c7fca7d489ef74b1973611e10deb4f1aa7
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Sat Aug 29 11:59:51 2020 -0700
RANGER-2979: fix for NPE in unit-test
(cherry picked from commit bda27055c1d7b2df1a2e70a7a9c035759420803b)
---
.../authorization/hive/authorizer/RangerHiveAuthorizer.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
index e54f93a..d2b7807 100644
--- a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
+++ b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
@@ -347,7 +347,13 @@ public class RangerHiveAuthorizer extends RangerHiveAuthorizerBase {
if (LOG.isDebugEnabled()) {
LOG.debug("<== getCurrentRoleNamesFromRanger() for user " + user);
}
- Set<String> userRoles = new HashSet<String>(hivePlugin.getUserRoles(user, auditHandler));
+
+ List<String> userRoles = hivePlugin.getUserRoles(user, auditHandler);
+
+ if (userRoles == null) {
+ userRoles = Collections.emptyList();
+ }
+
for (String role : userRoles) {
if (!ROLE_ADMIN.equalsIgnoreCase(role)) {
ret.add(role);