----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/66294/#review200320 -----------------------------------------------------------
security-admin/db/postgres/optimized/current/ranger_core_db_postgres.sql Line 1221 (original), 1221 (patched) <https://reviews.apache.org/r/66294/#comment281016> Patch fails to apply. Please check. ``` $ git apply --check -v < ~/Downloads/0001-RANGER-1985-Code-changes-to-support-follow-up-tasks-.patch Checking patch security-admin/db/mysql/optimized/current/ranger_core_db_mysql.sql... Checking patch security-admin/db/mysql/patches/031-create-schema-for-usersync-audit-info.sql... Checking patch security-admin/db/oracle/optimized/current/ranger_core_db_oracle.sql... Checking patch security-admin/db/oracle/patches/031-create-schema-for-usersync-audit-info.sql... Checking patch security-admin/db/postgres/optimized/current/ranger_core_db_postgres.sql... error: while searching for: event_time TIMESTAMP DEFAULT NULL NULL, user_name varchar(255) NOT NULL, sync_source varchar(128) NOT NULL, no_of_users bigint(20) NOT NULL, no_of_groups bigint(20) NOT NULL, sync_source_info varchar(4000) NOT NULL, session_id varchar(255) DEFAULT NULL, primary key (id), error: patch failed: security-admin/db/postgres/optimized/current/ranger_core_db_postgres.sql:1221 error: security-admin/db/postgres/optimized/current/ranger_core_db_postgres.sql: patch does not apply Checking patch security-admin/db/postgres/patches/031-create-schema-for-usersync-audit-info.sql... Checking patch security-admin/db/sqlanywhere/optimized/current/ranger_core_db_sqlanywhere.sql... Checking patch security-admin/db/sqlanywhere/patches/031-create-schema-for-usersync-audit-info.sql... Checking patch security-admin/db/sqlserver/optimized/current/ranger_core_db_sqlserver.sql... Checking patch security-admin/db/sqlserver/patches/031-create-schema-for-usersync-audit-info.sql... Checking patch security-admin/src/main/java/org/apache/ranger/entity/XXUgsyncAuditInfo.java... Checking patch security-admin/src/main/java/org/apache/ranger/service/XUgsyncAuditInfoService.java... Checking patch security-admin/src/main/java/org/apache/ranger/service/XUgsyncAuditInfoServiceBase.java... Checking patch security-admin/src/main/java/org/apache/ranger/view/VXFileSyncSourceInfo.java... Checking patch security-admin/src/main/java/org/apache/ranger/view/VXLdapSyncSourceInfo.java... Checking patch security-admin/src/main/java/org/apache/ranger/view/VXUgsyncAuditInfo.java... Checking patch security-admin/src/main/java/org/apache/ranger/view/VXUnixSyncSourceInfo.java... Checking patch ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapDeltaUserGroupBuilder.java... Checking patch ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapPolicyMgrUserGroupBuilder.java... Checking patch ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java... Checking patch ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java... Checking patch ugsync/src/main/java/org/apache/ranger/unixusersync/model/FileSyncSourceInfo.java... Checking patch ugsync/src/main/java/org/apache/ranger/unixusersync/model/LdapSyncSourceInfo.java... Checking patch ugsync/src/main/java/org/apache/ranger/unixusersync/model/UgsyncAuditInfo.java... Checking patch ugsync/src/main/java/org/apache/ranger/unixusersync/model/UnixSyncSourceInfo.java... Checking patch ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java... Checking patch ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java... Checking patch ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java... Checking patch ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java... Checking patch ugsync/src/test/java/org/apache/ranger/usergroupsync/PolicyMgrUserGroupBuilderTest.java... ``` - Velmurugan Periasamy On March 29, 2018, 4:17 p.m., Sailaja Polavarapu wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/66294/ > ----------------------------------------------------------- > > (Updated March 29, 2018, 4:17 p.m.) > > > Review request for ranger, Ankita Sinha, Gautam Borad, Abhay Kulkarni, Madhan > Neethiraj, Pradeep Agrawal, Ramesh Mani, Selvamohan Neethiraj, Sailaja > Polavarapu, and Velmurugan Periasamy. > > > Bugs: RANGER-1985 > https://issues.apache.org/jira/browse/RANGER-1985 > > > Repository: ranger > > > Description > ------- > > – Add other meta-data to sync source popup (like group search first enabled) > – Distinguish between full sync and incremental sync events > – Show synctime, last modified time in event time format > – In addition to #users/groups sync'ed from source, show added/updated users > (explore this to see how best to show this without confusing users) > > > Diffs > ----- > > security-admin/db/mysql/optimized/current/ranger_core_db_mysql.sql 7892a6a5 > > security-admin/db/mysql/patches/031-create-schema-for-usersync-audit-info.sql > 2405a3ef > security-admin/db/oracle/optimized/current/ranger_core_db_oracle.sql > 1f03978c > > security-admin/db/oracle/patches/031-create-schema-for-usersync-audit-info.sql > e03e8937 > security-admin/db/postgres/optimized/current/ranger_core_db_postgres.sql > 5b3f4bef > > security-admin/db/postgres/patches/031-create-schema-for-usersync-audit-info.sql > 2227f011 > > security-admin/db/sqlanywhere/optimized/current/ranger_core_db_sqlanywhere.sql > 42a8704e > > security-admin/db/sqlanywhere/patches/031-create-schema-for-usersync-audit-info.sql > 26d857b5 > security-admin/db/sqlserver/optimized/current/ranger_core_db_sqlserver.sql > 7421d4d5 > > security-admin/db/sqlserver/patches/031-create-schema-for-usersync-audit-info.sql > 362f4152 > > security-admin/src/main/java/org/apache/ranger/entity/XXUgsyncAuditInfo.java > 56098338 > > security-admin/src/main/java/org/apache/ranger/service/XUgsyncAuditInfoService.java > 85a96512 > > security-admin/src/main/java/org/apache/ranger/service/XUgsyncAuditInfoServiceBase.java > bf6f6e15 > > security-admin/src/main/java/org/apache/ranger/view/VXFileSyncSourceInfo.java > d8c66ca1 > > security-admin/src/main/java/org/apache/ranger/view/VXLdapSyncSourceInfo.java > fd2d8e11 > security-admin/src/main/java/org/apache/ranger/view/VXUgsyncAuditInfo.java > 6fef928a > > security-admin/src/main/java/org/apache/ranger/view/VXUnixSyncSourceInfo.java > 47bd839d > > ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapDeltaUserGroupBuilder.java > 7d85f33b > > ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapPolicyMgrUserGroupBuilder.java > 54a519a9 > > ugsync/src/main/java/org/apache/ranger/ldapusersync/process/LdapUserGroupBuilder.java > 85cba3c5 > > ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java > 45eeb1bc > > ugsync/src/main/java/org/apache/ranger/unixusersync/model/FileSyncSourceInfo.java > 02387e11 > > ugsync/src/main/java/org/apache/ranger/unixusersync/model/LdapSyncSourceInfo.java > 318138d4 > > ugsync/src/main/java/org/apache/ranger/unixusersync/model/UgsyncAuditInfo.java > 9dfd3a55 > > ugsync/src/main/java/org/apache/ranger/unixusersync/model/UnixSyncSourceInfo.java > 97b95a1f > > ugsync/src/main/java/org/apache/ranger/unixusersync/process/FileSourceUserGroupBuilder.java > a50b0c76 > > ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java > 9d3112dd > > ugsync/src/main/java/org/apache/ranger/unixusersync/process/UnixUserGroupBuilder.java > c58589ef > ugsync/src/main/java/org/apache/ranger/usergroupsync/UserGroupSync.java > f078cb8d > > ugsync/src/test/java/org/apache/ranger/usergroupsync/PolicyMgrUserGroupBuilderTest.java > 312ea9b8 > > > Diff: https://reviews.apache.org/r/66294/diff/1/ > > > Testing > ------- > > 1. Performed functional tests with unix, file, and LDAP/AD as sync sources > 2. Performed functional tests with different combinations of group search and > user search with AD/LDAP as sync source > 3. Also ran some functional tests with and without incremental sync and > nested groups > > > Thanks, > > Sailaja Polavarapu > >