> On Oct. 27, 2016, 1:37 p.m., Jonathan Hurley wrote: > > ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java, > > line 361 > > <https://reviews.apache.org/r/53216/diff/1/?file=1546993#file1546993line361> > > > > Always good to update the reference to the entity after a merge (in > > case it's used later on) > > > > desiredStateEntity = dao.merge(...) > > Nahappan Somasundaram wrote: > desiredStateEntity is a local variable and is got from > getServiceDesiredStateEntity(): > ``` > // Refresh the cached reference on setters > private ServiceDesiredStateEntity getServiceDesiredStateEntity() { > return serviceDesiredStateDAO.findByPK(serviceDesiredStateEntityPK); > } > ``` > So any other function that gets the entity will get the updated entity.
Yes, I know it's local. But if someone adds code later on which uses this entity, they'll be using the un-managed one. The local variable should be re-assigned after the merge just for future-proofing. - Jonathan ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/53216/#review154051 ----------------------------------------------------------- On Oct. 26, 2016, 9:53 p.m., Nahappan Somasundaram wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/53216/ > ----------------------------------------------------------- > > (Updated Oct. 26, 2016, 9:53 p.m.) > > > Review request for Ambari, Jonathan Hurley, Nate Cole, Robert Levas, Sumit > Mohanty, and Sid Wagle. > > > Bugs: AMBARI-18711 > https://issues.apache.org/jira/browse/AMBARI-18711 > > > Repository: ambari > > > Description > ------- > > AMBARI-18711: Ambari-server: DB changes to enable/disable credential store > support > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java > 6cb3ddee73a8035b9486c2fc7affb58399b85d2c > ambari-server/src/main/java/org/apache/ambari/server/state/Service.java > df3cfd8d589c1d4bf47b8fbcacb541b762de4bb9 > ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java > 9b560595dd837878cbea631fcef48ab93d6cc4a9 > ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql > a0a0afdc1627c64839fa4a3c0449ab42326303fa > ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql > 7a0231530c6d5385bbe305570253630593a6dac5 > ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql > 4ba371a12e527b96ac78e098a19c6f8361637855 > ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql > c5a9119e7ca22b28da003d79923d4d521ad5c36c > ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql > 2905eda40c143aaee6e90c76610ff0be24c84d38 > ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql > 6b19974318d7017f0a13bdd8f924b6878cac8900 > > Diff: https://reviews.apache.org/r/53216/diff/ > > > Testing > ------- > > ** 1. mvn clean install -DskipTests ** > > [INFO] > ------------------------------------------------------------------------ > [INFO] Reactor Summary: > [INFO] > [INFO] Ambari Main ....................................... SUCCESS [7.742s] > [INFO] Apache Ambari Project POM ......................... SUCCESS [0.049s] > [INFO] Ambari Web ........................................ SUCCESS [1:12.384s] > [INFO] Ambari Views ...................................... SUCCESS [1.056s] > [INFO] Ambari Admin View ................................. SUCCESS [6.276s] > [INFO] utility ........................................... SUCCESS [0.328s] > [INFO] ambari-metrics .................................... SUCCESS [0.806s] > [INFO] Ambari Metrics Common ............................. SUCCESS [6.815s] > [INFO] Ambari Metrics Hadoop Sink ........................ SUCCESS [3.661s] > [INFO] Ambari Metrics Flume Sink ......................... SUCCESS [1.347s] > [INFO] Ambari Metrics Kafka Sink ......................... SUCCESS [1.318s] > [INFO] Ambari Metrics Storm Sink ......................... SUCCESS [2.499s] > [INFO] Ambari Metrics Storm Sink (Legacy) ................ SUCCESS [1.459s] > [INFO] Ambari Metrics Collector .......................... SUCCESS [8.828s] > [INFO] Ambari Metrics Monitor ............................ SUCCESS [2.057s] > [INFO] Ambari Metrics Grafana ............................ SUCCESS [0.793s] > [INFO] Ambari Metrics Assembly ........................... SUCCESS [1:13.807s] > [INFO] Ambari Server ..................................... SUCCESS [2:27.298s] > [INFO] Ambari Functional Tests ........................... SUCCESS [1.001s] > [INFO] Ambari Agent ...................................... SUCCESS [24.945s] > [INFO] Ambari Client ..................................... SUCCESS [0.050s] > [INFO] Ambari Python Client .............................. SUCCESS [1.033s] > [INFO] Ambari Groovy Client .............................. SUCCESS [2.037s] > [INFO] Ambari Shell ...................................... SUCCESS [0.038s] > [INFO] Ambari Python Shell ............................... SUCCESS [0.662s] > [INFO] Ambari Groovy Shell ............................... SUCCESS [0.800s] > [INFO] ambari-logsearch .................................. SUCCESS [0.267s] > [INFO] Ambari Logsearch Appender ......................... SUCCESS [0.198s] > [INFO] Ambari Logsearch Solr Client ...................... SUCCESS [1.125s] > [INFO] Ambari Logsearch Portal ........................... SUCCESS [5.831s] > [INFO] Ambari Logsearch Log Feeder ....................... SUCCESS [3.729s] > [INFO] Ambari Logsearch Assembly ......................... SUCCESS [0.078s] > [INFO] > ------------------------------------------------------------------------ > [INFO] BUILD SUCCESS > [INFO] > ------------------------------------------------------------------------ > [INFO] Total time: 6:21.021s > [INFO] Finished at: Wed Oct 26 18:45:17 PDT 2016 > [INFO] Final Memory: 305M/1207M > [INFO] > ------------------------------------------------------------------------ > > ** 2. mvn test -DskipPythonTests -Dtest=*Service*,*MetaInfo*,*Component* > > ** The following tests were in failure prior to the current changes ** > * > Results : > > Tests in error: > AmbariMetaInfoTest.testCrossCheckJmxToGangliaMetrics:1002 » NullPointer > KerberosServiceMetaInfoTest.before:160->createAmbariMetaInfo:211 » > NullPointer > KerberosServiceMetaInfoTest.before:160->createAmbariMetaInfo:211 » > NullPointer > KerberosServiceMetaInfoTest.before:160->createAmbariMetaInfo:211 » > NullPointer > > Tests run: 480, Failures: 0, Errors: 4, Skipped: 3 > > ** 3. Manual tests ** > > Manually tested the changes by installing a few services. Verified that the > DB changes did not affect the service installation. > > > Thanks, > > Nahappan Somasundaram > >
