> On Jan. 23, 2017, 3:53 p.m., Velmurugan Periasamy wrote: > > embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java, > > line 445 > > <https://reviews.apache.org/r/55754/diff/1/?file=1610442#file1610442line445> > > > > Patch does not apply in the master branch. Could you please check? > > > > ``` > > $ git apply --check -v < ~/Downloads/RANGER-1316.patch > > Checking patch embeddedwebserver/scripts/ranger-admin-services.sh... > > Checking patch > > embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java... > > error: while searching for: > > } > > > > } catch (Exception e) { > > e.printStackTrace(); > > } > > > > } > > protected long getLongConfig(String key, long defaultValue) { > > long ret = 0; > > String retStr = getConfig(key); > > if (retStr == null) { > > ret = defaultValue; > > } else { > > ret = Long.parseLong(retStr); > > } > > return ret; > > } > > public void updateHttpConnectorAttribConfig(Tomcat server) { > > > > server.getConnector().setAllowTrace(Boolean.valueOf(getConfig("ranger.service.http.connector.attrib.allowTrace","false"))); > > > > server.getConnector().setAsyncTimeout(getLongConfig("ranger.service.http.connector.attrib.asyncTimeout", > > 10000)); > > > > server.getConnector().setEnableLookups(Boolean.valueOf(getConfig("ranger.service.http.connector.attrib.enableLookups","false"))); > > > > server.getConnector().setMaxHeaderCount(getIntConfig("ranger.service.http.connector.attrib.maxHeaderCount", > > 100)); > > > > server.getConnector().setMaxParameterCount(getIntConfig("ranger.service.http.connector.attrib.maxParameterCount", > > 10000)); > > > > server.getConnector().setMaxPostSize(getIntConfig("ranger.service.http.connector.attrib.maxPostSize", > > 2097152)); > > > > server.getConnector().setMaxSavePostSize(getIntConfig("ranger.service.http.connector.attrib.maxSavePostSize", > > 4096)); > > > > server.getConnector().setParseBodyMethods(getConfig("ranger.service.http.connector.attrib.methods", > > "POST")); > > Iterator<Object> > > iterator=serverConfigProperties.keySet().iterator(); > > String key=null; > > String property=null; > > while (iterator.hasNext()){ > > key=iterator.next().toString(); > > if(key!=null && > > key.startsWith("ranger.service.http.connector.property.")){ > > > > property=key.replace("ranger.service.http.connector.property.",""); > > > > server.getConnector().setProperty(property,getConfig(key)); > > > > LOG.info(property+":"+server.getConnector().getProperty(property)); > > } > > } > > } > > } > > > > error: patch failed: > > embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java:417 > > error: > > embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java: > > patch does not apply > > Checking patch kms/scripts/ranger-kms.. > > ```
Conflict resolved and patch updated. - Ankita ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/55754/#review162640 ----------------------------------------------------------- On Jan. 24, 2017, 5:51 a.m., Ankita Sinha wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/55754/ > ----------------------------------------------------------- > > (Updated Jan. 24, 2017, 5:51 a.m.) > > > Review request for ranger, Don Bosco Durai, Colm O hEigeartaigh, Gautam > Borad, Abhay Kulkarni, Madhan Neethiraj, Pradeep Agrawal, Selvamohan > Neethiraj, Velmurugan Periasamy, and Qiang Zhang. > > > Bugs: RANGER-1316 > https://issues.apache.org/jira/browse/RANGER-1316 > > > Repository: ranger > > > Description > ------- > > To choose Ranger Admin or Ranger KMS for server start was depended on > "logDir", so now this is being refactored and decision is made on basis of > "servername". > > Some code imporvement is being taken care. > > > Diffs > ----- > > embeddedwebserver/scripts/ranger-admin-services.sh ee467fc > > embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java > e334026 > kms/scripts/ranger-kms 80181d7 > > Diff: https://reviews.apache.org/r/55754/diff/ > > > Testing > ------- > > Tested Patch for the following scenarios : > 1. Ranger Admin and Ranger KMS on Simple Cluster > 2. Ranger Admin and Ranger KMS on Secure Cluster > 3. Ranger Admin and Ranger KMS on Secure + SSL Cluster > > > Thanks, > > Ankita Sinha > >
